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>

diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index d910282e2b294ad53f2f8914c26091bd2b508cc1..fb2920950d426508f9ae61ce2172c425c1e97058 100644 (file)
--- 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 043f06a82717d57fd2b9b1caa919e70039864f47..aade13cc014b83fbdc2bb0a457a9482aee6612d3 100644 (file)
--- 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 55317abba23704de00ebc50d0b51e209eafcd31b..0d1a7766be8af04333c077669668344db41567eb 100644 (file)
--- 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 ba9736ebef45c6a2ec7f98947c619c168fad8fc6..ffa8b602426ed91204f412e68ff27f0cf3fb3f62 100644 (file)
--- 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 5fa4234fd090f014b3bb5a41a5846c607ab6a84f..92a7e608ceb81ce5a5d3ebaf9fe256bef82a6250 100644 (file)
--- 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 4f6778c720dbfdac4d493999c13a7a09585bd713..ab616497fa078f33193daefc95af255190e37cdc 100644 (file)
--- 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 0ccb9f6df6fe057f4358d1c771c5870619d8a953..9b587fbbe877aaa8c7b2cf7461f356544ab0f1e0 100644 (file)
--- 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 713ff172bceeb9693f468a43d5d6d18bf571e63f..198b5b10a52c3e6e7057c47b669df016e4ddfc4a 100644 (file)
--- 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 aced3e5e26a33bc818969713bcfa21bf78494a92..94c2e05346a6f6201a41a242273406af9633d99d 100644 (file)
--- 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 1a7806fad77bc99f5e80243f38ad787d4198cde8..faecb60992404560075a2040989f58332675a465 100644 (file)
--- 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 5bf13dcdeb3e6578a61e697f1dba05fedf794962..0157377354a573ea40b11ff2972b69bdea0f5d15 100644 (file)
--- 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 5bdafebb6b11b2757cbce7d62d2c437ee66e618f..5df85722d1df2efd1da5d8ef400f8040deab6e81 100644 (file)
--- 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 f5ebb934eb9722e7f28595e1f1daddf9f01c5884..fb0699cb94ff11048c5c13b8e487b8eebb9ad22e 100644 (file)
--- 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 a078643708f79d3f20d3fd8953200dced085d56b..5f0cc9eb7e9e60c74bda1412233441ac7dee15e3 100644 (file)
--- 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 cfb5b0b38bbe31473d39977eb250afdeadca02c2..dac821f1acc358dd966b2e600e9a31e1f919957e 100644 (file)
--- 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 0e1b4a0a46ce558e8c2f4e731bba4820b6ae6628..815ecf55c4df005ac0641a214b0b339823f5ed9e 100644 (file)
--- 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 bdabc214b2632ce47a70a1c11b29c12fbf9bfc4c..a15b81b0cfdcafe0c91a4880397afc4e16378848 100644 (file)
--- 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 b846bff2491e3bd038b7793cb02cd1b7b6017bfe..4e4d1c157d780159400632ec143f28337c775b03 100644 (file)
--- 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 5dcb55ba46af5f9ec2347109b2f5272eac844c70..a0d0cc2403d348329f6812908267c44aecab2080 100644 (file)
--- 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 0e473b415dd0832022794011465878c44bcc5419..d0fc062ef8cb4a797f883111d22848042a329e29 100644 (file)
--- 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 0c80fef0533250c928f766931f9c0a7806039671..b97b43eb7d01cdac88f0db41be288fdfd623a3fb 100644 (file)
--- 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 92f4d27990df981e66d766dd4c4b4dd7c2f56a03..1bbd1fae99860184d4216695e1032e2fe0322d8f 100644 (file)
--- 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 2ca4d05ae8adacf4a43cac10c93182c2a5796ee2..a09736e1bb91852e8c452c04b3721b45edaecaf8 100644 (file)
--- 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 e65441bb76a0777130de4b54f2389d17f20d44cb..dfc6220b5e01173af3b2aa2a9183f342a4da5298 100644 (file)
--- 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 e23ea627006f6529e4dd14909ee8f95996aef72e..2de1111998fe6f5987480cceef503ca84c2188e2 100644 (file)
--- 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 1f4e3fcdede19c6723bc1e58337bd6494b9413c6..6a7b4014edcd5fa2c5bea1052ab9f8004eaf2b56 100644 (file)
--- 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>
 #ifdef CONFIG_MTD_NOR_FLASH
 #include <flash.h>
 #endif

diff --git a/cmd/mmc.c b/cmd/mmc.c
index f7b02b3149b516a5e2e0dd738d8f51a723f62ec1..7bd4cd9e016d98c18653d1bebf7d8e26cdd8ca21 100644 (file)
--- 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 75d4b64d6882641ee4ec6768fef5644122f97685..a344cfa76b1d52c1f77fa00b4c7f9c8cb2dd4f07 100644 (file)
--- 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 058635cb2f83cba90de9f37f1fd02b6c3434fefb..bd102f5af9dfe782cc542842238886af5bc00751 100644 (file)
--- 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 <log.h>

diff --git a/cmd/version.c b/cmd/version.c
index f83f6aff92ca6c1df5c04ea8c8263c0ef628e46f..190ef6a9061ab7fcd2eb45e2df790f578617f0e4 100644 (file)
--- 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 406073c8105a6bca76a710cbc17ce86f73d5e016..8488663354ba781a9b135f75f5bbd6bd96f5ab54 100644 (file)
--- 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 5c86faeb217bedbceeaec993e0b5d0d0b4d456e5..18e2246733b09a63b03468a066edc4eaa61699e4 100644 (file)
--- 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 e702f0234ee7d7cd3caaeb95d53c952fa4e50193..56eb60fa275338a4ce910b99583dfb1b9f2da61c 100644 (file)
--- 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 dc071f1ed6653eb5aefe07b9a42e18df12bbbafd..bde941223997345dd9ec1dca6be125d76acc08bb 100644 (file)
--- 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 7254aa70bfdf30676fb049e1d56cc12abf69bd00..57b71ed1b365c438f9f1625273abadbe77270076 100644 (file)
--- 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 98f0089266d40f135612eaefe983153c47f6224c..0e520cc1030df205baf7af50d19c1e2e6fcef43c 100644 (file)
--- 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 8457733edb596e8b301371ce51b415ddc0d94f2c..0ebd288ab4209788dd0f93271e3dbcc18915dfef 100644 (file)
--- 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 172bc9980f6bb9a11ec061b194759c170f6765dc..3dd04fa88581191068b4bc56b82fa23a2c760997 100644 (file)
--- 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 f389e5ef952417e55011e0edcffbd0f1f5d8265d..1903562ac473184c7d2ff522b7a58ce32999650c 100644 (file)
--- 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 da81425038d4ed5952bcdd9abd34ad3bed4c7135..607a22368cba37df67d4bbae0a2246ab5a955132 100644 (file)
--- 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 6893394e08923d8df4cefea020f6ea24c11a81f4..3a8c7b867ebabbc20f8cc0534ef65dc15dde80f1 100644 (file)
--- 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 e19e34244d1fc23ea55c870b6720921f8c52e6ac..6a0d953a72904c91381ec517bdfabcad266c6ce0 100644 (file)
--- 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 26a356baf8418b7a5e08f9ca49688f89c3d11389..e3c86e080a1dead1a460723578eae5a4943315e6 100644 (file)
--- 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 04277b1269f3357fdaed3691742c97cbb6f4ed89..d48e342ea08eeac10ddf9f410be7887057906f23 100644 (file)
--- 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 c059ea4cfed7aa87630a30008a43904c7be6f174..fd2a45d34b03cf9942213844ec1bf0ab2e288b60 100644 (file)
--- 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 efbeb00ab63c1b155b544074c8adc4cef93db1eb..7350e1c4d525dfefb895eeedb26cfea402249707 100644 (file)
--- 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 6de1a3eb6d5dd46ce54237be8ac4b58297b69cf5..8324b4a22f20661a71de9a34451076659353e170 100644 (file)
--- 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 71df59bca0e530d0ce67d544bddbb2caef4bd2e9..25c317f4439216ad780c6484518affb259922417 100644 (file)
--- 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 33fcbb85335ae064ed503f916c4af7edc41a886d..85dacbc7590229c5518ebbb16ac9d77692089735 100644 (file)
--- 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 05ec23570248aa6b4be70cd6cb6088f9805af841..4fca85ebee265d6b1207e1fda1d770bd033d7531 100644 (file)
--- 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 360b01bcf5ffd62e2f821a7bf83478426171293a..7feb446a559086a891e39c6160a6b674cd6ec9e9 100644 (file)
--- 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 ffa78f97ca0ad93ea7f0a86c376a163f61a6560b..96b6b71a606fe117ab98882c2d6d86069b44135d 100644 (file)
--- 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 9f65cfb20dc9eb0d7447e041cfcb1e9afc0c9e53..c6a124885e4eadd31a5ea77508bcc64de252eb10 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -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 451d73529f2af9285e3c9ae9f9f26d2ab7dbb90f..dea9c25ffd89c52835009ffd01c46ee9c130fb3d 100644 (file)
--- 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>