diff options
| author | Simon Glass <sjg@chromium.org> | 2022-07-31 21:28:48 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-10 20:46:55 +0300 |
| commit | 4e4bf9449b4f436419490a4a8cf4de17433cac15 (patch) | |
| tree | d8a562562004af2b2a5dc0dbe1b19bec686c21de | |
| parent | 99699a770744b91d93399daccf3b3caf506c04c7 (diff) | |
| download | u-boot-4e4bf9449b4f436419490a4a8cf4de17433cac15.tar.xz | |
common: Drop display_options.h from common header
Move this out of the common header and include it only where needed.
Signed-off-by: Simon Glass <sjg@chromium.org>
54 files changed, 53 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index d910282e2b..fb2920950d 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.kang@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 043f06a827..aade13cc01 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 55317abba2..0d1a7766be 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 ba9736ebef..ffa8b60242 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 5fa4234fd0..92a7e608ce 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 4f6778c720..ab616497fa 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 0ccb9f6df6..9b587fbbe8 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 713ff172bc..198b5b10a5 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 aced3e5e26..94c2e05346 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 1a7806fad7..faecb60992 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 5bf13dcdeb..0157377354 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 5bdafebb6b..5df85722d1 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 f5ebb934eb..fb0699cb94 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 a078643708..5f0cc9eb7e 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 cfb5b0b38b..dac821f1ac 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 0e1b4a0a46..815ecf55c4 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 bdabc214b2..a15b81b0cf 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 b846bff249..4e4d1c157d 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 5dcb55ba46..a0d0cc2403 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 0e473b415d..d0fc062ef8 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> @@ -13,6 +13,7 @@ #include <axi.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <dm.h> #include <log.h> @@ -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> @@ -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 e65441bb76..dfc6220b5e 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> @@ -9,6 +9,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <asm/io.h> /* Display values from last command */ @@ -16,6 +16,7 @@ #include <cli.h> #include <command.h> #include <console.h> +#include <display_options.h> #ifdef CONFIG_MTD_NOR_FLASH #include <flash.h> #endif @@ -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> @@ -2,6 +2,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <dm.h> #include <hexdump.h> #include <i2c.h> @@ -7,6 +7,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #include <div64.h> #include <dm.h> #include <log.h> diff --git a/cmd/version.c b/cmd/version.c index f83f6aff92..190ef6a906 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 406073c810..8488663354 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 5c86faeb21..18e2246733 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 e702f0234e..56eb60fa27 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> #ifdef CONFIG_MTD_NOR_FLASH #include <flash.h> diff --git a/common/console.c b/common/console.c index dc071f1ed6..bde9412239 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 7254aa70bf..57b71ed1b3 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 98f0089266..0e520cc103 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 8457733edb..0ebd288ab4 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 172bc9980f..3dd04fa885 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 f389e5ef95..1903562ac4 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 da81425038..607a22368c 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 6893394e08..3a8c7b867e 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 e19e34244d..6a0d953a72 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 26a356baf8..e3c86e080a 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 <log.h> #include <watchdog.h> #include <dm.h> diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 04277b1269..d48e342ea0 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 c059ea4cfe..fd2a45d34b 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 efbeb00ab6..7350e1c4d5 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> @@ -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 71df59bca0..25c317f443 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 33fcbb8533..85dacbc759 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); /** @@ -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 360b01bcf5..7feb446a55 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 ffa78f97ca..96b6b71a60 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> @@ -28,6 +28,7 @@ #include <common.h> #include <command.h> +#include <display_options.h> #ifdef CONFIG_SYS_DIRECT_FLASH_NFS #include <flash.h> #endif diff --git a/net/tftp.c b/net/tftp.c index 451d73529f..dea9c25ffd 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> |