diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-30 13:00:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-30 13:00:20 -0400 |
| commit | 9f0a6df3a57469061582c6b27fc869829681beca (patch) | |
| tree | 80b1a3707a5a4f6fd1d9db03ce24e12e0d47b781 /arch/x86/cpu/i386/interrupt.c | |
| parent | 6d7dacf726ca043a3f5487549bbfa506c990c813 (diff) | |
| parent | 249154672d43db6c7978fd9b67d224e9dec09867 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- DM ACPI support (Part A)
- Improve support for chain-loading x86 U-Boot
Diffstat (limited to 'arch/x86/cpu/i386/interrupt.c')
| -rw-r--r-- | arch/x86/cpu/i386/interrupt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index 4c7e9ea215..e67a116ac1 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -264,6 +264,9 @@ int interrupt_init(void) struct udevice *dev; int ret; + if (!ll_boot_init()) + return 0; + /* Try to set up the interrupt router, but don't require one */ ret = irq_first_device_type(X86_IRQT_BASE, &dev); if (ret && ret != -ENODEV) @@ -295,8 +298,7 @@ int interrupt_init(void) * TODO(sjg@chromium.org): But we don't handle these correctly when * booted from EFI. */ - if (ll_boot_init()) - enable_interrupts(); + enable_interrupts(); #endif return 0; |