LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bin Meng 2015-10-22 19:13:30 -07:00
parent bffeed0158
commit da3fe24759
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/cpu/interrupts.c
View File

@ -252,7 +252,7 @@ int interrupt_init(void)
/* Just in case... */ /* Just in case... */
disable_interrupts(); disable_interrupts();
#ifdef CONFIG_SYS_PCAT_INTERRUPTS #ifdef CONFIG_I8259_PIC
/* Initialize the master/slave i8259 pic */ /* Initialize the master/slave i8259 pic */
i8259_init(); i8259_init();
#endif #endif

2
arch/x86/include/asm/u-boot-x86.h
View File

@ -29,7 +29,7 @@ typedef void (timer_fnc_t) (void);
int register_timer_isr (timer_fnc_t *isr_func); int register_timer_isr (timer_fnc_t *isr_func);
unsigned long get_tbclk_mhz(void); unsigned long get_tbclk_mhz(void);
void timer_set_base(uint64_t base); void timer_set_base(uint64_t base);
int pcat_timer_init(void); int i8254_init(void);
/* cpu/.../interrupts.c */ /* cpu/.../interrupts.c */
int cpu_init_interrupts(void); int cpu_init_interrupts(void);

4
arch/x86/lib/Makefile
View File

@ -19,8 +19,8 @@ obj-y += lpc-uclass.o
obj-y += mpspec.o obj-y += mpspec.o
obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o
obj-y += cmd_mtrr.o obj-y += cmd_mtrr.o
obj-$(CONFIG_SYS_PCAT_INTERRUPTS) += pcat_interrupts.o obj-$(CONFIG_I8259_PIC) += i8259.o
obj-$(CONFIG_SYS_PCAT_TIMER) += pcat_timer.o obj-$(CONFIG_I8254_TIMER) += i8254.o
ifndef CONFIG_DM_PCI ifndef CONFIG_DM_PCI
obj-$(CONFIG_PCI) += pci_type1.o obj-$(CONFIG_PCI) += pci_type1.o
endif endif

2
arch/x86/lib/pcat_timer.c → arch/x86/lib/i8254.c
View File

@ -12,7 +12,7 @@
#define TIMER1_VALUE 18 /* 15.6us */ #define TIMER1_VALUE 18 /* 15.6us */
#define TIMER2_VALUE 0x0a8e /* 440Hz */ #define TIMER2_VALUE 0x0a8e /* 440Hz */
int pcat_timer_init(void) int i8254_init(void)
{ {
/* /*
* Initialize counter 1, used to refresh request signal. * Initialize counter 1, used to refresh request signal.

0
arch/x86/lib/pcat_interrupts.c → arch/x86/lib/i8259.c
View File

6
arch/x86/lib/tsc_timer.c
View File

@ -368,9 +368,9 @@ void __udelay(unsigned long usec)
int timer_init(void) int timer_init(void)
{ {
#ifdef CONFIG_SYS_PCAT_TIMER #ifdef CONFIG_I8254_TIMER
/* Set up the PCAT timer if required */ /* Set up the i8254 timer if required */
pcat_timer_init(); i8254_init();
#endif #endif
return 0; return 0;

4
include/configs/x86-common.h
View File

@ -155,8 +155,8 @@
*/ */
#define CONFIG_SYS_X86_TSC_TIMER #define CONFIG_SYS_X86_TSC_TIMER
#define CONFIG_SYS_PCAT_INTERRUPTS #define CONFIG_I8259_PIC
#define CONFIG_SYS_PCAT_TIMER #define CONFIG_I8254_TIMER
#define CONFIG_SYS_STACK_SIZE (32 * 1024) #define CONFIG_SYS_STACK_SIZE (32 * 1024)
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE