x86: Rename pcat_ to i8254 and i8259 accordingly

Rename pcat_timer.c to i8254.c and pcat_interrupts.c to i8259.c,
to match their header file names (i8254.h and i8259.h).

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index addd26e4e62974ea10c4d74e4f11e2fadc5291b3..b00ddc0cb488163e5e14c1a6127ddbbb1dc8a04f 100644 (file)
--- a/arch/x86/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
@@ -252,7 +252,7 @@ int interrupt_init(void)
        /* Just in case... */
        disable_interrupts();
 
-#ifdef CONFIG_SYS_PCAT_INTERRUPTS
+#ifdef CONFIG_I8259_PIC
        /* Initialize the master/slave i8259 pic */
        i8259_init();
 #endif

diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h
index 1c459d5ae34af16d1ae5ed9a53fae6ca954a922f..dbf8e95c1b3457fe8feb04d6915d05b04119fdd7 100644 (file)
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -29,7 +29,7 @@ typedef void (timer_fnc_t) (void);
 int register_timer_isr (timer_fnc_t *isr_func);
 unsigned long get_tbclk_mhz(void);
 void timer_set_base(uint64_t base);
-int pcat_timer_init(void);
+int i8254_init(void);
 
 /* cpu/.../interrupts.c */
 int cpu_init_interrupts(void);

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 2f82a21aff1079de8fbf9c136df8961f9da90919..d676e2c14f27f61a282adfc1f62972e5558a4eed 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -19,8 +19,8 @@ obj-y += lpc-uclass.o
 obj-y  += mpspec.o
 obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o
 obj-y += cmd_mtrr.o
-obj-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o
-obj-$(CONFIG_SYS_PCAT_TIMER) += pcat_timer.o
+obj-$(CONFIG_I8259_PIC) += i8259.o
+obj-$(CONFIG_I8254_TIMER) += i8254.o
 ifndef CONFIG_DM_PCI
 obj-$(CONFIG_PCI) += pci_type1.o
 endif

diff --git a/arch/x86/lib/pcat_timer.c b/arch/x86/lib/i8254.c
similarity index 97%
rename from arch/x86/lib/pcat_timer.c
rename to arch/x86/lib/i8254.c
index 347cdda9f6b264210c1a025fc4626c2839ecaeb3..46a42452893bf490f1ad4cf106e19d50c0a5a32d 100644 (file)
--- a/arch/x86/lib/pcat_timer.c
+++ b/arch/x86/lib/i8254.c
@@ -12,7 +12,7 @@
 #define TIMER1_VALUE   18      /* 15.6us */
 #define TIMER2_VALUE   0x0a8e  /* 440Hz */
 
-int pcat_timer_init(void)
+int i8254_init(void)
 {
        /*
         * Initialize counter 1, used to refresh request signal.

diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/i8259.c
similarity index 100%
rename from arch/x86/lib/pcat_interrupts.c
rename to arch/x86/lib/i8259.c

diff --git a/arch/x86/lib/tsc_timer.c b/arch/x86/lib/tsc_timer.c
index 0df1af238c1d654e59d9b09c555c363cb2196943..e02b918843bf783ade0b0c85b9786d1092f5f49b 100644 (file)
--- a/arch/x86/lib/tsc_timer.c
+++ b/arch/x86/lib/tsc_timer.c
@@ -368,9 +368,9 @@ void __udelay(unsigned long usec)
 
 int timer_init(void)
 {
-#ifdef CONFIG_SYS_PCAT_TIMER
-       /* Set up the PCAT timer if required */
-       pcat_timer_init();
+#ifdef CONFIG_I8254_TIMER
+       /* Set up the i8254 timer if required */
+       i8254_init();
 #endif
 
        return 0;

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 2e90ef509d04c67635e9c205986ca1dee4a30a42..58d2f427dee19f733e7f9f63d5aeef44a3cbdde4 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -155,8 +155,8 @@
  */
 
 #define CONFIG_SYS_X86_TSC_TIMER
-#define CONFIG_SYS_PCAT_INTERRUPTS
-#define CONFIG_SYS_PCAT_TIMER
+#define CONFIG_I8259_PIC
+#define CONFIG_I8254_TIMER
 
 #define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE