diff mbox

[U-Boot,v2,5/8] x86: Rename pcat_ to i8254 and i8259 accordingly

Message ID 1445566413-20821-6-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng Oct. 23, 2015, 2:13 a.m. UTC 
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>
---

Changes in v2: None

 arch/x86/cpu/interrupts.c                   | 2 +-
 arch/x86/include/asm/u-boot-x86.h           | 2 +-
 arch/x86/lib/Makefile                       | 4 ++--
 arch/x86/lib/{pcat_timer.c => i8254.c}      | 2 +-
 arch/x86/lib/{pcat_interrupts.c => i8259.c} | 0
 arch/x86/lib/tsc_timer.c                    | 6 +++---
 include/configs/x86-common.h                | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename arch/x86/lib/{pcat_timer.c => i8254.c} (97%)
 rename arch/x86/lib/{pcat_interrupts.c => i8259.c} (100%)

Comments

Simon Glass Oct. 30, 2015, 10:30 p.m. UTC | #1 
Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index addd26e..b00ddc0 100644
--- 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 1c459d5..dbf8e95 100644
--- 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 2f82a21..d676e2c 100644
--- 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 347cdda..46a4245 100644
--- 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 0df1af2..e02b918 100644
--- 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 2e90ef5..58d2f42 100644
--- 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