Move this out of the common header and include it only where needed. Signed-off-by: Simon Glass <s...@chromium.org> ---
Changes in v3: - Rebase to master Changes in v2: - Rebase to master arch/arm/cpu/armv7/s5p-common/cpu_info.c | 1 + arch/arm/mach-at91/arm926ejs/eflash.c | 1 + arch/arm/mach-imx/hab.c | 1 + arch/powerpc/cpu/mpc85xx/cpu.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/tlb.c | 1 + arch/powerpc/cpu/mpc8xx/cpu.c | 1 + arch/powerpc/cpu/mpc8xxx/law.c | 1 + arch/x86/cpu/broadwell/refcode.c | 1 + board/freescale/ls1028a/ls1028a.c | 1 + board/freescale/ls1088a/ls1088a.c | 1 + board/freescale/ls2080aqds/ls2080aqds.c | 1 + board/freescale/ls2080ardb/ls2080ardb.c | 1 + board/freescale/lx2160a/lx2160a.c | 1 + board/freescale/mpc8548cds/mpc8548cds.c | 1 + board/kosagi/novena/novena.c | 1 + board/traverse/ten64/ten64.c | 1 + boot/image-board.c | 1 + boot/image.c | 1 + cmd/acpi.c | 1 + cmd/axi.c | 1 + cmd/bcb.c | 1 + cmd/cpu.c | 1 + cmd/fpgad.c | 1 + cmd/io.c | 1 + cmd/mem.c | 1 + cmd/mmc.c | 1 + cmd/rtc.c | 1 + cmd/sf.c | 1 + cmd/version.c | 1 + common/bloblist.c | 1 + common/board_f.c | 1 + common/board_r.c | 1 + common/console.c | 1 + common/log.c | 1 + common/splash.c | 1 + drivers/core/acpi.c | 1 + drivers/cpu/bmips_cpu.c | 1 + drivers/ddr/fsl/main.c | 1 + drivers/mmc/gen_atmel_mci.c | 1 + drivers/mtd/onenand/onenand_uboot.c | 1 + drivers/mtd/spi/sf_dataflash.c | 1 + drivers/mtd/spi/spi-nor-core.c | 1 + drivers/net/xilinx_axi_emac.c | 1 + drivers/tpm/tpm_atmel_twi.c | 1 + drivers/tpm/tpm_tis_sandbox.c | 1 + fs/fs.c | 1 + include/common.h | 1 - include/display_options.h | 1 + lib/aes.c | 1 + lib/display_options.c | 1 + lib/fdtdec.c | 1 + net/nfs.c | 1 + net/tftp.c | 1 + 54 files changed, 53 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index d910282e2b2..fb2920950d4 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -4,6 +4,7 @@ * Minkyu Kang <mk7.k...@samsung.com> */ #include <common.h> +#include <display_options.h> #include <fdtdec.h> #include <init.h> #include <asm/global_data.h> diff --git a/arch/arm/mach-at91/arm926ejs/eflash.c b/arch/arm/mach-at91/arm926ejs/eflash.c index 043f06a8271..aade13cc014 100644 --- a/arch/arm/mach-at91/arm926ejs/eflash.c +++ b/arch/arm/mach-at91/arm926ejs/eflash.c @@ -43,6 +43,7 @@ * do a read-modify-write for partially programmed pages */ #include <common.h> +#include <display_options.h> #include <flash.h> #include <log.h> #include <asm/io.h> diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 55317abba23..0d1a7766be8 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> #include <config.h> +#include <display_options.h> #include <fuse.h> #include <mapmem.h> #include <image.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index ba9736ebef4..ffa8b602426 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -12,6 +12,7 @@ #include <common.h> #include <cpu_func.h> #include <clock_legacy.h> +#include <display_options.h> #include <init.h> #include <irq_func.h> #include <log.h> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 5fa4234fd09..92a7e608ceb 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <net.h> diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c index 4f6778c720d..ab616497fa0 100644 --- a/arch/powerpc/cpu/mpc85xx/tlb.c +++ b/arch/powerpc/cpu/mpc85xx/tlb.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <asm/bitops.h> #include <asm/global_data.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 6d16ed084e6..892283436de 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -18,6 +18,7 @@ #include <common.h> #include <cpu_func.h> +#include <display_options.h> #include <net.h> #include <time.h> #include <vsprintf.h> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 713ff172bce..198b5b10a52 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <asm/bitops.h> #include <asm/global_data.h> #include <linux/compiler.h> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c index aced3e5e26a..94c2e05346a 100644 --- a/arch/x86/cpu/broadwell/refcode.c +++ b/arch/x86/cpu/broadwell/refcode.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <errno.h> #include <init.h> #include <log.h> diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 1a7806fad77..faecb609924 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <malloc.h> #include <errno.h> diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 5bf13dcdeb3..0157377354a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <i2c.h> #include <init.h> diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 5bdafebb6b1..5df85722d1d 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h> diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index f5ebb934eb9..fb0699cb94f 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h> diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index a078643708f..5f0cc9eb7e9 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -5,6 +5,7 @@ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <dm.h> #include <init.h> #include <asm/global_data.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index cfb5b0b38bb..dac821f1acc 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <init.h> #include <net.h> #include <pci.h> diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c index 0e1b4a0a46c..815ecf55c4d 100644 --- a/board/kosagi/novena/novena.c +++ b/board/kosagi/novena/novena.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <eeprom.h> #include <init.h> diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index bdabc214b26..a15b81b0cfd 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -5,6 +5,7 @@ * Copyright 2019-2021 Traverse Technologies */ #include <common.h> +#include <display_options.h> #include <dm/uclass.h> #include <env.h> #include <i2c.h> diff --git a/boot/image-board.c b/boot/image-board.c index b846bff2491..4e4d1c157d7 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -11,6 +11,7 @@ #include <common.h> #include <bootstage.h> #include <cpu_func.h> +#include <display_options.h> #include <env.h> #include <fpga.h> #include <image.h> diff --git a/boot/image.c b/boot/image.c index 5dcb55ba46a..a0d0cc2403d 100644 --- a/boot/image.c +++ b/boot/image.c @@ -9,6 +9,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <env.h> +#include <display_options.h> #include <init.h> #include <lmb.h> #include <log.h> diff --git a/cmd/acpi.c b/cmd/acpi.c index 0e473b415dd..d0fc062ef8c 100644 --- a/cmd/acpi.c +++ b/cmd/acpi.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <command.h> +#include <display_options.h> #include <mapmem.h> #include <acpi/acpi_table.h> #include <asm/acpi_table.h> diff --git a/cmd/axi.c b/cmd/axi.c index 0c80fef0533..b97b43eb7d0 100644 --- a/cmd/axi.c +++ b/cmd/axi.c @@ -13,6 +13,7 @@ #include <axi.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <dm.h> #include <log.h> diff --git a/cmd/bcb.c b/cmd/bcb.c index 92f4d27990d..1bbd1fae998 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -9,6 +9,7 @@ #include <bcb.h> #include <command.h> #include <common.h> +#include <display_options.h> #include <log.h> #include <part.h> #include <malloc.h> diff --git a/cmd/cpu.c b/cmd/cpu.c index 2ca4d05ae8a..a09736e1bb9 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -8,6 +8,7 @@ #include <common.h> #include <command.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h> diff --git a/cmd/fpgad.c b/cmd/fpgad.c index e65441bb76a..dfc6220b5e0 100644 --- a/cmd/fpgad.c +++ b/cmd/fpgad.c @@ -11,6 +11,7 @@ #include <common.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <gdsys_fpga.h> diff --git a/cmd/io.c b/cmd/io.c index e23ea627006..2de1111998f 100644 --- a/cmd/io.c +++ b/cmd/io.c @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <asm/io.h> /* Display values from last command */ diff --git a/cmd/mem.c b/cmd/mem.c index b7511382d3a..7e36927b711 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -16,6 +16,7 @@ #include <cli.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <flash.h> #include <hash.h> #include <log.h> diff --git a/cmd/mmc.c b/cmd/mmc.c index f7b02b3149b..7bd4cd9e016 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -8,6 +8,7 @@ #include <blk.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <memalign.h> #include <mmc.h> #include <part.h> diff --git a/cmd/rtc.c b/cmd/rtc.c index 75d4b64d688..a344cfa76b1 100644 --- a/cmd/rtc.c +++ b/cmd/rtc.c @@ -2,6 +2,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <dm.h> #include <hexdump.h> #include <i2c.h> diff --git a/cmd/sf.c b/cmd/sf.c index cd50b38081c..f9ac50e734c 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <div64.h> #include <dm.h> #include <flash.h> diff --git a/cmd/version.c b/cmd/version.c index f83f6aff92c..190ef6a9061 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <timestamp.h> #include <version.h> #include <version_string.h> diff --git a/common/bloblist.c b/common/bloblist.c index 406073c8105..8488663354b 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -9,6 +9,7 @@ #include <common.h> #include <bloblist.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/common/board_f.c b/common/board_f.c index 5c86faeb217..18e2246733b 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -16,6 +16,7 @@ #include <console.h> #include <cpu.h> #include <cpu_func.h> +#include <display_options.h> #include <dm.h> #include <env.h> #include <env_internal.h> diff --git a/common/board_r.c b/common/board_r.c index ed29069d2de..fcd333e1fbb 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -13,6 +13,7 @@ #include <api.h> #include <bootstage.h> #include <cpu_func.h> +#include <display_options.h> #include <exports.h> #include <flash.h> #include <hang.h> diff --git a/common/console.c b/common/console.c index dc071f1ed66..bde94122399 100644 --- a/common/console.c +++ b/common/console.c @@ -7,6 +7,7 @@ #include <common.h> #include <console.h> #include <debug_uart.h> +#include <display_options.h> #include <dm.h> #include <env.h> #include <stdarg.h> diff --git a/common/log.c b/common/log.c index 7254aa70bfd..57b71ed1b36 100644 --- a/common/log.c +++ b/common/log.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/common/splash.c b/common/splash.c index 98f0089266d..0e520cc1030 100644 --- a/common/splash.c +++ b/common/splash.c @@ -21,6 +21,7 @@ */ #include <common.h> +#include <display_options.h> #include <env.h> #include <splash.h> #include <lcd.h> diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 8457733edb5..0ebd288ab42 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -9,6 +9,7 @@ #define LOG_CATEOGRY LOGC_ACPI #include <common.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 172bc9980f6..3dd04fa8858 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -9,6 +9,7 @@ #include <common.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <init.h> diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index f389e5ef952..1903562ac47 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <i2c.h> #include <fsl_ddr_sdram.h> diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c index da81425038d..607a22368cb 100644 --- a/drivers/mmc/gen_atmel_mci.c +++ b/drivers/mmc/gen_atmel_mci.c @@ -10,6 +10,7 @@ #include <common.h> #include <clk.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <mmc.h> diff --git a/drivers/mtd/onenand/onenand_uboot.c b/drivers/mtd/onenand/onenand_uboot.c index 6893394e089..3a8c7b867eb 100644 --- a/drivers/mtd/onenand/onenand_uboot.c +++ b/drivers/mtd/onenand/onenand_uboot.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <display_options.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 85867817c78..34d0dd983d6 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 8a226a7af55..89ee8ac5552 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <display_options.h> #include <flash.h> #include <log.h> #include <watchdog.h> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 04277b1269f..d48e342ea08 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -9,6 +9,7 @@ #include <config.h> #include <common.h> #include <cpu_func.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <net.h> diff --git a/drivers/tpm/tpm_atmel_twi.c b/drivers/tpm/tpm_atmel_twi.c index c059ea4cfed..fd2a45d34b0 100644 --- a/drivers/tpm/tpm_atmel_twi.c +++ b/drivers/tpm/tpm_atmel_twi.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <i2c.h> diff --git a/drivers/tpm/tpm_tis_sandbox.c b/drivers/tpm/tpm_tis_sandbox.c index efbeb00ab63..7350e1c4d52 100644 --- a/drivers/tpm/tpm_tis_sandbox.c +++ b/drivers/tpm/tpm_tis_sandbox.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <asm/state.h> diff --git a/fs/fs.c b/fs/fs.c index 6de1a3eb6d5..8324b4a22f2 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -7,6 +7,7 @@ #include <command.h> #include <config.h> +#include <display_options.h> #include <errno.h> #include <common.h> #include <env.h> diff --git a/include/common.h b/include/common.h index 71df59bca0e..25c317f4439 100644 --- a/include/common.h +++ b/include/common.h @@ -23,7 +23,6 @@ #include <stdio.h> #include <linux/kernel.h> #include <asm/u-boot.h> /* boot information for Linux kernel */ -#include <display_options.h> #include <vsprintf.h> #endif /* __ASSEMBLY__ */ diff --git a/include/display_options.h b/include/display_options.h index 33fcbb85335..85dacbc7590 100644 --- a/include/display_options.h +++ b/include/display_options.h @@ -19,6 +19,7 @@ * @size: Size to print * @suffix String to print after the size */ +#include <display_options.h> void print_size(uint64_t size, const char *suffix); /** diff --git a/lib/aes.c b/lib/aes.c index 05ec2357024..4fca85ebee2 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -23,6 +23,7 @@ #ifndef USE_HOSTCC #include <common.h> +#include <display_options.h> #include <log.h> #else #include <string.h> diff --git a/lib/display_options.c b/lib/display_options.c index 360b01bcf5f..7feb446a559 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -7,6 +7,7 @@ #include <common.h> #include <compiler.h> #include <console.h> +#include <display_options.h> #include <div64.h> #include <version_string.h> #include <linux/ctype.h> diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ffa78f97ca0..96b6b71a606 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -6,6 +6,7 @@ #ifndef USE_HOSTCC #include <common.h> #include <boot_fit.h> +#include <display_options.h> #include <dm.h> #include <hang.h> #include <init.h> diff --git a/net/nfs.c b/net/nfs.c index 9152ab742ef..fcb3352dfa9 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -28,6 +28,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <flash.h> #include <image.h> #include <log.h> diff --git a/net/tftp.c b/net/tftp.c index bfc4c9bde9c..2e3620e059b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -7,6 +7,7 @@ */ #include <common.h> #include <command.h> +#include <display_options.h> #include <efi_loader.h> #include <env.h> #include <image.h> -- 2.37.1.455.g008518b4e5-goog
