common: Drop display_options.h from common header
Subsystems (13)
PATCH v3 1/1 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 <[email protected]>
---
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(-)
arch/arm/cpu/armv7/s5p-common/cpu_info.c +1 -0
@@ -4,6 +4,7 @@* Minkyu Kang <[email protected]> */ #include <common.h> +#include <display_options.h> #include <fdtdec.h> #include <init.h> #include <asm/global_data.h>
arch/arm/mach-at91/arm926ejs/eflash.c +1 -0
@@ -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>
arch/arm/mach-imx/hab.c +1 -0
@@ -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>
arch/powerpc/cpu/mpc85xx/cpu.c +1 -0
@@ -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>
arch/powerpc/cpu/mpc85xx/cpu_init.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <net.h>
arch/powerpc/cpu/mpc85xx/tlb.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <display_options.h> #include <init.h> #include <asm/bitops.h> #include <asm/global_data.h>
arch/powerpc/cpu/mpc8xx/cpu.c +1 -0
@@ -18,6 +18,7 @@#include <common.h> #include <cpu_func.h> +#include <display_options.h> #include <net.h> #include <time.h> #include <vsprintf.h>
arch/powerpc/cpu/mpc8xxx/law.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <display_options.h> #include <asm/bitops.h> #include <asm/global_data.h> #include <linux/compiler.h>
arch/x86/cpu/broadwell/refcode.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <display_options.h> #include <errno.h> #include <init.h> #include <log.h>
board/freescale/ls1028a/ls1028a.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <display_options.h> #include <init.h> #include <malloc.h> #include <errno.h>
board/freescale/ls1088a/ls1088a.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <i2c.h> #include <init.h>
board/freescale/ls2080aqds/ls2080aqds.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h>
board/freescale/ls2080ardb/ls2080ardb.c +1 -0
@@ -5,6 +5,7 @@*/ #include <common.h> #include <clock_legacy.h> +#include <display_options.h> #include <env.h> #include <init.h> #include <malloc.h>
board/freescale/lx2160a/lx2160a.c +1 -0
@@ -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>
board/freescale/mpc8548cds/mpc8548cds.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <display_options.h> #include <init.h> #include <net.h> #include <pci.h>
board/kosagi/novena/novena.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <display_options.h> #include <dm.h> #include <eeprom.h> #include <init.h>
board/traverse/ten64/ten64.c +1 -0
@@ -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>
boot/image-board.c +1 -0
@@ -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>
boot/image.c +1 -0
@@ -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>
cmd/acpi.c +1 -0
@@ -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>
cmd/axi.c +1 -0
@@ -13,6 +13,7 @@#include <axi.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <dm.h> #include <log.h>
cmd/bcb.c +1 -0
@@ -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>
cmd/cpu.c +1 -0
@@ -8,6 +8,7 @@#include <common.h> #include <command.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h>
cmd/fpgad.c +1 -0
@@ -11,6 +11,7 @@#include <common.h> #include <command.h> #include <console.h> +#include <display_options.h> #include <gdsys_fpga.h>
cmd/io.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <command.h> +#include <display_options.h> #include <asm/io.h> /* Display values from last command */
cmd/mem.c +1 -0
@@ -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>
cmd/mmc.c +1 -0
@@ -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>
cmd/rtc.c +1 -0
@@ -2,6 +2,7 @@#include <common.h> #include <command.h> +#include <display_options.h> #include <dm.h> #include <hexdump.h> #include <i2c.h>
cmd/sf.c +1 -0
@@ -7,6 +7,7 @@#include <common.h> #include <command.h> +#include <display_options.h> #include <div64.h> #include <dm.h> #include <flash.h>
cmd/version.c +1 -0
@@ -6,6 +6,7 @@#include <common.h> #include <command.h> +#include <display_options.h> #include <timestamp.h> #include <version.h> #include <version_string.h>
common/bloblist.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <bloblist.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <mapmem.h>
common/board_f.c +1 -0
@@ -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>
common/board_r.c +1 -0
@@ -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>
common/console.c +1 -0
@@ -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>
common/log.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <display_options.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h>
common/splash.c +1 -0
@@ -21,6 +21,7 @@*/ #include <common.h> +#include <display_options.h> #include <env.h> #include <splash.h> #include <lcd.h>
drivers/core/acpi.c +1 -0
@@ -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>
drivers/cpu/bmips_cpu.c +1 -0
@@ -9,6 +9,7 @@#include <common.h> #include <cpu.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <init.h>
drivers/ddr/fsl/main.c +1 -0
@@ -11,6 +11,7 @@*/ #include <common.h> +#include <display_options.h> #include <dm.h> #include <i2c.h> #include <fsl_ddr_sdram.h>
drivers/mmc/gen_atmel_mci.c +1 -0
@@ -10,6 +10,7 @@#include <common.h> #include <clk.h> +#include <display_options.h> #include <dm.h> #include <log.h> #include <mmc.h>
drivers/mtd/onenand/onenand_uboot.c +1 -0
@@ -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>
drivers/mtd/spi/sf_dataflash.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> +#include <display_options.h> #include <dm.h> #include <errno.h> #include <fdtdec.h>
drivers/mtd/spi/spi-nor-core.c +1 -0
@@ -10,6 +10,7 @@*/ #include <common.h> +#include <display_options.h> #include <flash.h> #include <log.h> #include <watchdog.h>
drivers/net/xilinx_axi_emac.c +1 -0
@@ -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>
drivers/tpm/tpm_atmel_twi.c +1 -0
@@ -6,6 +6,7 @@*/ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <i2c.h>
drivers/tpm/tpm_tis_sandbox.c +1 -0
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <display_options.h> #include <dm.h> #include <tpm-v1.h> #include <asm/state.h>
fs/fs.c +1 -0
@@ -7,6 +7,7 @@#include <command.h> #include <config.h> +#include <display_options.h> #include <errno.h> #include <common.h> #include <env.h>
include/common.h +0 -1
@@ -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__ */
include/display_options.h +1 -0
@@ -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);/**
lib/aes.c +1 -0
@@ -23,6 +23,7 @@#ifndef USE_HOSTCC #include <common.h> +#include <display_options.h> #include <log.h> #else #include <string.h>
lib/display_options.c +1 -0
@@ -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>
lib/fdtdec.c +1 -0
@@ -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>
net/nfs.c +1 -0
@@ -28,6 +28,7 @@#include <common.h> #include <command.h> +#include <display_options.h> #include <flash.h> #include <image.h> #include <log.h>
net/tftp.c +1 -0
@@ -7,6 +7,7 @@*/ #include <common.h> #include <command.h> +#include <display_options.h> #include <efi_loader.h> #include <env.h> #include <image.h>
Signature · 1 line
2.37.1.455.g008518b4e5-goog
Quoted 3 lines · Simon Glass
Move this out of the common header and include it only where needed.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom