diff options
| -rw-r--r-- | arch/x86/cpu/baytrail/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/baytrail/valleyview.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/i386/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/i386/interrupt.c | 1 | ||||
| -rw-r--r-- | drivers/pci/pci_rom.c | 1 | ||||
| -rw-r--r-- | drivers/video/broadwell_igd.c | 1 | ||||
| -rw-r--r-- | include/common.h | 7 | ||||
| -rw-r--r-- | include/init.h | 7 |
9 files changed, 14 insertions, 7 deletions
diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index 9394eab956b..a9cfcedd81c 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -8,6 +8,7 @@ #include <common.h> #include <cpu.h> #include <dm.h> +#include <init.h> #include <pci.h> #include <asm/cpu.h> #include <asm/cpu_x86.h> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index 8882a76eae5..f2e48f401fe 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <init.h> #include <mmc.h> #include <pci_ids.h> #include <asm/irq.h> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index d626e38fd18..dae06949cc6 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -24,6 +24,7 @@ #include <cpu_func.h> #include <dm.h> #include <errno.h> +#include <init.h> #include <malloc.h> #include <syscon.h> #include <asm/acpi.h> diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 2b27617ca3a..1592b2c9d3b 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -20,6 +20,7 @@ #include <common.h> #include <cpu_func.h> +#include <init.h> #include <malloc.h> #include <spl.h> #include <asm/control_regs.h> diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index 78aa51a3ea6..991cf5c56bf 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -13,6 +13,7 @@ #include <common.h> #include <dm.h> #include <efi_loader.h> +#include <init.h> #include <irq_func.h> #include <asm/control_regs.h> #include <asm/i8259.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 1d4064e3769..90f224b0452 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -26,6 +26,7 @@ #include <bios_emul.h> #include <dm.h> #include <errno.h> +#include <init.h> #include <malloc.h> #include <pci.h> #include <pci_rom.h> diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c index e6df037cb93..c23421d25be 100644 --- a/drivers/video/broadwell_igd.c +++ b/drivers/video/broadwell_igd.c @@ -8,6 +8,7 @@ #include <common.h> #include <bios_emul.h> #include <dm.h> +#include <init.h> #include <vbe.h> #include <video.h> #include <asm/cpu.h> diff --git a/include/common.h b/include/common.h index f38dc2ef3fb..a971f75f8bc 100644 --- a/include/common.h +++ b/include/common.h @@ -114,13 +114,6 @@ int get_serial_clock(void); offsetof(struct structure, member) == offset, \ "`struct " #structure "` offset for `" #member "` is not " #offset) -/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ -#ifdef CONFIG_EFI_STUB -#define ll_boot_init() false -#else -#define ll_boot_init() true -#endif - /* Pull in stuff for the build system */ #ifdef DO_DEPS_ONLY # include <env_internal.h> diff --git a/include/init.h b/include/init.h index f6105de6660..c5498476f8c 100644 --- a/include/init.h +++ b/include/init.h @@ -16,6 +16,13 @@ struct global_data; #ifndef __ASSEMBLY__ /* put C only stuff in this section */ +/* Avoid using CONFIG_EFI_STUB directly as we may boot from other loaders */ +#ifdef CONFIG_EFI_STUB +#define ll_boot_init() false +#else +#define ll_boot_init() true +#endif + /* * Function Prototypes */ |