@@ -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>
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <init.h>
#include <mmc.h>
#include <pci_ids.h>
#include <asm/irq.h>
@@ -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>
@@ -20,6 +20,7 @@
#include <common.h>
#include <cpu_func.h>
+#include <init.h>
#include <malloc.h>
#include <asm/control_regs.h>
#include <asm/cpu.h>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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
*/
This is an init-related function so belongs in that file. Move it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/baytrail/cpu.c | 1 + arch/x86/cpu/baytrail/valleyview.c | 1 + arch/x86/cpu/cpu.c | 1 + arch/x86/cpu/i386/cpu.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + drivers/pci/pci_rom.c | 1 + drivers/video/broadwell_igd.c | 1 + include/common.h | 7 ------- include/init.h | 7 +++++++ 9 files changed, 14 insertions(+), 7 deletions(-)