common: Drop bootstage.h from common header

Move this fairly uncommon header out of the common header.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index d38c18ef8f436ab629b628e7c7e17b91b6219259..1b08ffe2857cda9f975ec14e84c39ecef44dab78 100644 (file)
--- a/arch/arc/lib/bootm.c
+++ b/arch/arc/lib/bootm.c
@@ -3,9 +3,10 @@
  * Copyright (C) 2013-2014 Synopsys, Inc. All rights reserved.
  */
 
+#include <common.h>
+#include <bootstage.h>
 #include <irq_func.h>
 #include <asm/cache.h>
-#include <common.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c
index 46e63294fef016254ceefd1ec1d787015f250fd4..6fe3ede387b7b28655688e216ccafe3f2abcf58f 100644 (file)
--- a/arch/arm/cpu/armv8/generic_timer.c
+++ b/arch/arm/cpu/armv8/generic_timer.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <time.h>
 #include <asm/system.h>

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index dc845a997f4bb9ad7b2a7b2ad2261869d3caf6ac..c189bdcf9a08bd1e3513dc9319563c3c7ad0a9f1 100644 (file)
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <dm.h>

diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index 19445b3fc7a56c4ac78d57af4d721ff2b7688c6c..fb1170d00d769eacffc8eb3c4b38f80e54f6f168 100644 (file)
--- a/arch/m68k/lib/bootm.c
+++ b/arch/m68k/lib/bootm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 87d2d6ee70df4200d841bb2a5ec6164640ced4fc..f7303b790fcb3941489c5bee9a630a0a88a9b5e8 100644 (file)
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>

diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index f1db6d23b84e091fa098baada15e5f12ac3228a6..6a6764ac2db290aee07e4f9b2b3eb3ab482c818c 100644 (file)
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <env.h>
 #include <image.h>
 #include <fdt_support.h>

diff --git a/arch/nds32/lib/bootm.c b/arch/nds32/lib/bootm.c
index 1003bc87b9db8b0f360ca2e5d9ce747ca865627c..b17368647d357581e0866c55029968ab923019d7 100644 (file)
--- a/arch/nds32/lib/bootm.c
+++ b/arch/nds32/lib/bootm.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <hang.h>

diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 390e8c0673c555bfb592461a8ab7bbb9ed0d2fdf..1cef75c4bef9f08f55a4a406715e4feec3645289 100644 (file)
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -8,6 +8,7 @@
 
 
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <init.h>

diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 0d06095da11aab3b6cb74a75b060fadd5d897d1e..c24aba1dc9f3db7a945872f96b5d4e6e88d90034 100644 (file)
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <dm.h>
 #include <fdt_support.h>

diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c
index 56ee3f5826030160d04068c5f71fe9183a8d5783..842640c50edfe5ccb6941047f3296ce6ffa3c37c 100644 (file)
--- a/arch/sandbox/cpu/cpu.c
+++ b/arch/sandbox/cpu/cpu.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>

diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c
index 2de03fb8e02e616f6a435d115e0ddbc068986a33..d38c3164c12eefb0e107698603495f5124738d8c 100644 (file)
--- a/arch/sandbox/lib/bootm.c
+++ b/arch/sandbox/lib/bootm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <asm/io.h>
 
 #define        LINUX_ARM_ZIMAGE_MAGIC  0x016f2818

diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index 7ef169b147f97970518d108a260b9c988c96ca44..fd6e73dfc8a531ad184ddce17e467b8d622ae7f7 100644 (file)
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <binman.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <irq.h>
 #include <malloc.h>

diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index d32f2a989876b3f38284869f5c79a7721bb381f8..a555e6c0d3886e8ac79557907b202ff2f349aaa9 100644 (file)
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <binman_sym.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <malloc.h>
 #include <spi.h>

diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c
index e8ccaf2212963c8f48c890db1514f37551f7c6b0..016259780950ea0cffe7531b459171c7750675e8 100644 (file)
--- a/arch/x86/cpu/coreboot/timestamp.c
+++ b/arch/x86/cpu/coreboot/timestamp.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <asm/arch/timestamp.h>
 #include <asm/arch/sysinfo.h>
 #include <linux/compiler.h>

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 2e5d0ddd9f63d212eec35a85effcc68eb305d92a..e0f23bb509060c333ee44030327113d516e4399a 100644 (file)
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <dm.h>

diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 07d8f1f279ce28ed8161f5339489731314959784..0837655e1241d963d43655e89f66a97c88aeded4 100644 (file)
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <hang.h>
 #include <dm/device.h>

diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index c7dc2ea257835f561a4beea177e2d1974029be96..008e8aeb366e63026c299b1842dbfe19462e1f9f 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_init.c
+++ b/arch/x86/lib/fsp2/fsp_init.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <binman.h>
 #include <binman_sym.h>
+#include <bootstage.h>
 #include <cbfs.h>
 #include <dm.h>
 #include <init.h>

diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c
index 300be8b093faab319914da99e2e51045766f0d12..117f36a84829f88b2b71aba568e0374f94697cce 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_meminit.c
+++ b/arch/x86/lib/fsp2/fsp_meminit.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <binman.h>
+#include <bootstage.h>
 #include <asm/mrccache.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp2/fsp_api.h>

diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c
index 66a3cb39f18f5867d16ef23204c0010a8e104334..28c15a22a2ee9ef84397fa738fa0d45da1fb1f6a 100644 (file)
--- a/arch/x86/lib/fsp2/fsp_silicon_init.c
+++ b/arch/x86/lib/fsp2/fsp_silicon_init.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <binman.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <asm/arch/fsp/fsp_configs.h>
 #include <asm/arch/fsp/fsp_s_upd.h>

diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c
index 057b229433e950b99caf6e3c9373c26ac88c183a..458eaf95c0443546d97ca2a76adad197f8745314 100644 (file)
--- a/arch/xtensa/lib/bootm.c
+++ b/arch/xtensa/lib/bootm.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>

diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 5a8c6e282bf903138ca758b351837cd20c58fd43..0ff8a9053e7d6659d96eda092333ee72a76e9144 100644 (file)
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/soc.h>

diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index 1e4477aa5ff10b65dae7f10301c56f507bb4d606..fd2f0df371ad00100bebb9563f34218b3bb14eb9 100644 (file)
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>

diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c
index 32e4933d20ae3b67dbee12c1c1337b41d60340a0..ac6462d7ff5753f2bd9259eb72fa5b9046d8a7f3 100644 (file)
--- a/board/armltd/integrator/integrator.c
+++ b/board/armltd/integrator/integrator.c
@@ -17,6 +17,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <env.h>

diff --git a/board/armltd/vexpress/vexpress_common.c b/board/armltd/vexpress/vexpress_common.c
index ebd3322c6fcb5ed295c23e052b42c9e773a61899..9dc26b949eb2637906b37ea55c5fdf818b091528 100644 (file)
--- a/board/armltd/vexpress/vexpress_common.c
+++ b/board/armltd/vexpress/vexpress_common.c
@@ -16,6 +16,7 @@
  * Philippe Robin, <philippe.robin@arm.com>
  */
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <malloc.h>

diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 9698d8ee16a66704ee6408e04976e9ac7a5b5ee0..6e0ad4b53f8597fe1d687c9fa56774f3edc5dc59 100644 (file)
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -12,6 +12,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <errno.h>

diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index aa641259ac65edbf0b36e6bb4cc05808d8035a92..56a2c29e4c72235f9373c4297c963e8833827d82 100644 (file)
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <env.h>
 #include <env_internal.h>
 #include <flash.h>

diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c
index ad56dd7d019d98369adf6ce2eca061b21d78cda3..3da5005f4036dc6d3f9aed5f3c32c9d3f45ee944 100644 (file)
--- a/board/gdsys/p1022/controlcenterd-id.c
+++ b/board/gdsys/p1022/controlcenterd-id.c
@@ -11,6 +11,7 @@
 #endif
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>

diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index f193e833619662a57907605eb90e12596190351c..fbcb87092b2de535fc15c9eb193d95982fb89a26 100644 (file)
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <miiphy.h>
 #include <net.h>

diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index 7d7c427392f1355dfc068ac2aa406a3ca6185d6b..b604ee951b4b8b38efe41bc8814b19f68abcf062 100644 (file)
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -4,6 +4,7 @@
  *      Tapani Utriainen <linuxfae@technexion.com>
  */
 #include <common.h>
+#include <bootstage.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <twl4030.h>

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index cb3a12ec3733f1d7e70e668417edf9e82e8c3078..439b023da82804a57e0fd790df281eeade6359de 100644 (file)
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -13,6 +13,7 @@
  *
  */
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <env.h>
 #include <net.h>

diff --git a/cmd/bootstage.c b/cmd/bootstage.c
index ed0b0ff1fc835a03fe46ded5c40fe9c8d7c3fbc4..f1ea4e959822eaad4335f10e03537039056f304b 100644 (file)
--- a/cmd/bootstage.c
+++ b/cmd/bootstage.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 
 static int do_bootstage_report(cmd_tbl_t *cmdtp, int flag, int argc,
                               char * const argv[])

diff --git a/cmd/disk.c b/cmd/disk.c
index 9e008a388906fec9b5cc54523150e02f53f0e1ea..da0660148c1240d0ca3b1724791806064db2bc9a 100644 (file)
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -4,6 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  */
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <image.h>

diff --git a/cmd/nand.c b/cmd/nand.c
index 9c2b5d718efe41864ef0d522c90d39a141bfe9cc..c42ab24ec06d140cae7754d2833a367741a06ac6 100644 (file)
--- a/cmd/nand.c
+++ b/cmd/nand.c
@@ -20,6 +20,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <image.h>
 #include <asm/cache.h>
 #include <linux/mtd/mtd.h>

diff --git a/cmd/net.c b/cmd/net.c
index 1b724cc57090e7ab81eecf750c48157d1fa57ce8..282b38ccf998bdd653c1d82cc635e1a955b7a392 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -8,6 +8,7 @@
  * Boot support
  */
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>

diff --git a/cmd/usb.c b/cmd/usb.c
index 98fa300dfe4ca4e676d14f9fc9b11e0c61224872..858be726a47ec43cdffe51b1626c6d5d15127f0a 100644 (file)
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <bootstage.h>
 #include <command.h>
 #include <console.h>
 #include <dm.h>

diff --git a/common/board_f.c b/common/board_f.c
index c4247cd75f97c6991b69127a87332b4706e7e055..b9b5b8d6fa1d4d95d136181c0d05037dabcc2f86 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <bloblist.h>
+#include <bootstage.h>
 #include <clock_legacy.h>
 #include <console.h>
 #include <cpu.h>

diff --git a/common/board_r.c b/common/board_r.c
index bd1ac353c7a8a604a3d6962df6d5bc9ae678447b..a79a273d8f87104eaa801559a793f85b433ef712 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <api.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <exports.h>
 #include <flash.h>

diff --git a/common/bootm_os.c b/common/bootm_os.c
index 1d58462509cc07111c0eeadcd0029ffcee2b9705..44023532e134ab3811ea74804bde5459dafd5ad1 100644 (file)
--- a/common/bootm_os.c
+++ b/common/bootm_os.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <bootm.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <efi_loader.h>
 #include <env.h>

diff --git a/common/bootstage.c b/common/bootstage.c
index d2ed33663b7193b574722e5f3d0aa441dd571149..817f85a7feede41f8579849bf0872a4687e055ee 100644 (file)
--- a/common/bootstage.c
+++ b/common/bootstage.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <hang.h>
 #include <malloc.h>
 #include <sort.h>

diff --git a/common/cli.c b/common/cli.c
index 38bba17585ca5a56970ad61317d12408833cd657..e5e5894b2fa09b05a9699f0d63c973886c26d112 100644 (file)
--- a/common/cli.c
+++ b/common/cli.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <cli.h>
 #include <cli_hush.h>
 #include <command.h>

diff --git a/common/image.c b/common/image.c
index 14e27fbe3ca8f8cb98add21cddcdf3d29b54407e..20fa4bd4974f5fdf98778c17088ea008b43bb09f 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -8,6 +8,7 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <bootstage.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <malloc.h>

diff --git a/common/init/board_init.c b/common/init/board_init.c
index f7c8a173ffb9381acdb1ddb73a61f79d879d448e..4c4f0ced535cffece112215615accc9690276d1c 100644 (file)
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/common/main.c b/common/main.c
index 64287f7dee5a078d27fa055ad6d1a2ad1d863818..4b3cd302c3e22209db13c4ca491a861ad3fd0f23 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -8,6 +8,7 @@
 
 #include <common.h>
 #include <autoboot.h>
+#include <bootstage.h>
 #include <cli.h>
 #include <command.h>
 #include <console.h>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 163e960a1e865041cbef21b66755ef37321eb42d..b33905ead2f7566172ee2a27ece0710c6c42bba0 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <bloblist.h>
 #include <binman_sym.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>

diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index 6b17f18bc075a45826a5638f8fcd79d2303257a5..2f3d40c2277ed892fc3af0ed19ee4e2d1081dd24 100644 (file)
--- a/drivers/pci/pci_rom.c
+++ b/drivers/pci/pci_rom.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <bios_emul.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 849c42f0cd2c0a53503d1b3f3b20aab6a1ec0366..949e364e78bf38fda6049b912d754d45178d03c8 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -6,6 +6,7 @@
 
 #include <common.h>
 #include <blk.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <env.h>
 #include <part.h>

diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c
index a9d7715a556a5356d4526f6f33148a0ca19bd5df..990a5ffa5136f679dbf97b336785d61a203a59a3 100644 (file)
--- a/drivers/spi/ich.c
+++ b/drivers/spi/ich.c
@@ -8,6 +8,7 @@
 #define LOG_CATEGORY   UCLASS_SPI
 
 #include <common.h>
+#include <bootstage.h>
 #include <div64.h>
 #include <dm.h>
 #include <dt-structs.h>

diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index ed48a145f2ce509a0c6f8da45a346790dc86b140..4837b0645b66440bc59ad1e978d1516b4e7bddae 100644 (file)
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
 #include <timer.h>

diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 54956e557a16e74e2de3b9a8791a7703da31ec72..0cbdc279a56324bb46b92bcfd895cad959b50ea1 100644 (file)
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <dm/ofnode.h>
 #include <mapmem.h>

diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 43cb2d820e89e1a7c2f0e55525ed4a152e39f2d2..04596ff1174e4b565e001e81e71aabad37352002 100644 (file)
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -7,6 +7,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <malloc.h>
 #include <time.h>

diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index c23421d25be7057556d542510cef875be7367c4c..86c4c10b386a4ad20c128f798e513c267ce8edd5 100644 (file)
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <bios_emul.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <init.h>
 #include <vbe.h>

diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c
index 913beab4d492fe43aceeefb6c9b033453b14bc20..a552f38cd07539dadb123ff9ee7c59777c866ff1 100644 (file)
--- a/drivers/video/tegra124/display.c
+++ b/drivers/video/tegra124/display.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <edid.h>
 #include <errno.h>

diff --git a/env/common.c b/env/common.c
index 1fd1bd01d3bb159aa1c4bcad1d317996b658231b..0256b3e3567481fb54c8570df0d578375429f06d 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -8,6 +8,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>

diff --git a/include/common.h b/include/common.h
index 85a211554a1a7c2f278860b77a9c383c4924daae..fd3e2de4cce9d83084d896639283cd7a9b11c5f1 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -35,7 +35,6 @@
 #include <init.h>
 #include <display_options.h>
 #include <vsprintf.h>
-#include <bootstage.h>
 #endif /* __ASSEMBLY__ */
 
 /* Pull in stuff for the build system */

diff --git a/lib/time.c b/lib/time.c
index 75de48f90032cc1f213fedd5ca57c263cd2b1c9d..1395f28715ca14d0f67538ede875ad53149166d1 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
 #include <time.h>

diff --git a/net/bootp.c b/net/bootp.c
index 2c918d83796ca6704b95f5ab0244deb712f7bdce..05bfede14a5fdbc0b47576f204b0949fa2a6e0a2 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -9,6 +9,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <efi_loader.h>

diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 48560d59f6608ff9da4c7c6312776d9047005a9e..5682b3a731cf279bf240f0fa3fc1e7c440a0acc5 100644 (file)
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <env.h>
 #include <net.h>

diff --git a/net/eth_common.c b/net/eth_common.c
index ed26b1b69359aae191481f058db7e99fa8c329b5..58f899a02405597673450630eaffd2ab6d8365ba 100644 (file)
--- a/net/eth_common.c
+++ b/net/eth_common.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <env.h>
 #include <miiphy.h>

diff --git a/net/eth_legacy.c b/net/eth_legacy.c
index 5d6b0d7d7f4599a640668b28bcfa462a8de4c987..e0ef4a11a7a3d252941891a38a41246f56892354 100644 (file)
--- a/net/eth_legacy.c
+++ b/net/eth_legacy.c
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <env.h>
 #include <net.h>

diff --git a/net/net.c b/net/net.c
index 087d399a24bab0b2200aaf030cbd42992aa44373..035293537b816dd2cdf33457b07162678e6d06d0 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -88,6 +88,7 @@
 
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <console.h>
 #include <env.h>

diff --git a/post/post.c b/post/post.c
index 696a60f70a7146a021ba95c59b724b9fe3746c6e..0f977fe2450f912f5a2dddd8e531e8d712c97052 100644 (file)
--- a/post/post.c
+++ b/post/post.c
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <env.h>
 #include <malloc.h>
 #include <stdio_dev.h>