summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2014-11-20 16:11:16 +0800
committerSimon Glass <sjg@chromium.org>2014-11-25 06:34:02 -0700
commit1dae2e0eb660553fd18870b53e4c43bd56414e3b (patch)
treea4680bc0f20291f016a711730b801a052ec2941a /arch/x86/lib
parenta549f7497b4d719d37e4a20378c81c1b29bf0404 (diff)
downloadu-boot-imx-1dae2e0eb660553fd18870b53e4c43bd56414e3b.zip
u-boot-imx-1dae2e0eb660553fd18870b53e4c43bd56414e3b.tar.gz
u-boot-imx-1dae2e0eb660553fd18870b53e4c43bd56414e3b.tar.bz2
x86: Refactor interrupt_init()
Rename interrupt_init() in arch/x86/lib/pcat_interrupts.c to i8259_init() and create a new interrupt_init() in arch/x86/cpu/interrupt.c to call i8259_init() followed by a call to cpu_init_interrupts(). Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/pcat_interrupts.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c
index f388db2..a9af87e 100644
--- a/arch/x86/lib/pcat_interrupts.c
+++ b/arch/x86/lib/pcat_interrupts.c
@@ -24,12 +24,10 @@
#error "CONFIG_SYS_NUM_IRQS must equal 16 if CONFIG_SYS_NUM_IRQS is defined"
#endif
-int interrupt_init(void)
+int i8259_init(void)
{
u8 i;
- disable_interrupts();
-
/* Mask all interrupts */
outb(0xff, MASTER_PIC + IMR);
outb(0xff, SLAVE_PIC + IMR);
@@ -65,11 +63,6 @@ int interrupt_init(void)
/* Interrupt 9 should be level triggered (SCI). The OS might do this */
configure_irq_trigger(9, true);
- /* Initialize core interrupt and exception functionality of CPU */
- cpu_init_interrupts();
-
- enable_interrupts();
-
return 0;
}