Skip to contentSkip to conversation

Remove <common.h> from a number of places

PATCH In review Tom Rini 1 participant 20 messages Apr 27, 2024 – May 7, 2024 Page 1 of 2

Subsystems (19)
Networking x86 VFS PowerPC +15 more subsystems
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

cover Remove <common.h> from a number of places

Hey all,

This series is the next step in winding down usage of <common.h> in order to be able to then remove it. This covers not quite 25% of the remaining users of the file. Of what is left, it's either arch/arm/, board/ or drivers/ code. I am likely to start tackling arch/arm/ next, and depending on how exactly I break that down I may try and cover some board/ code as well (for example, tackle arch/arm/mach-omap/ and arch/arm/mach-k3 and board/ti/ (and then the other vendors too..) in one commit.

Signature · 1 line
Tom
author
#1 lore raw

PATCH 1/18 init.h: Add "struct cmd_tbl"

In order to avoid needing to add <command.h> to this file, add "struct cmd_tbl" before the prototype for do_bdinfo().

---
 include/init.h | 2 ++
 1 file changed, 2 insertions(+)
include/init.h +2 -0
index 630d86729c4e..2c10171359cf 100644
@@ -401,6 +401,8 @@ void bdinfo_print_size(const char *name, uint64_t size);
 /* Show arch-specific information for the 'bd' command */
 void arch_print_bdinfo(void);
 
+struct cmd_tbl;
+
 int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]);
 
 #endif	/* __ASSEMBLY__ */
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/18 pci.h: Add missing <linux/types.h>

In reply to Tom Rini

This file has many "Linux" style types in it, add <linux/types.h>

---
 include/pci.h | 1 +
 1 file changed, 1 insertion(+)
include/pci.h +1 -0
index aad233769a35..ea3b73923d60 100644
@@ -520,6 +520,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
 #include <dm/pci.h>
 
 #ifdef CONFIG_SYS_PCI_64BIT
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 3/18 mpc85xx.h: Use <config.h> directly

In reply to Tom Rini

To ensure that board config headers which set values here in the CFG_SYS range are used, this header needs to include <config.h> directly.

---
 include/mpc85xx.h | 1 +
 1 file changed, 1 insertion(+)
include/mpc85xx.h +1 -0
index 636734dd3c63..ff86c7c12e0c 100644
@@ -6,6 +6,7 @@
 #ifndef	__MPC85xx_H__
 #define __MPC85xx_H__
 
+#include <config.h>
 #if defined(CONFIG_E500)
 #include <e500.h>
 #endif
Signature · 1 line
2.34.1
author
#4 lore raw

PATCH 4/18 cmd/Kconfig: Add some missing dependencies

In reply to Tom Rini

With the migration to Kconfig complete, we can now add some previously missing dependencies to some commands.

---
 cmd/Kconfig | 8 ++++++--
 env/Kconfig | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
cmd/Kconfig +6 -2
index c182d73ddbd7..d9df34942d4f 100644
@@ -539,6 +539,7 @@ config CMD_IMI
 
 config CMD_IMLS
 	bool "imls"
+	depends on MTD_NOR_FLASH || FLASH_CFI_DRIVER
 	help
 	  List all images found in flash
 
@@ -830,7 +831,7 @@ config SYS_EEPROM_SIZE
 
 config SYS_EEPROM_PAGE_WRITE_BITS
 	int "Number of bits used to address bytes in a single page"
-	depends on CMD_EEPROM
+	depends on CMD_EEPROM || ENV_IS_IN_EEPROM
 	default 8
 	help
 	  The EEPROM page size is 2^SYS_EEPROM_PAGE_WRITE_BITS.
@@ -1022,8 +1023,8 @@ config CMD_ARMFFA
 		- Displaying the arm_ffa device info
 
 config CMD_ARMFLASH
-	#depends on FLASH_CFI_DRIVER
 	bool "armflash"
+	depends on FLASH_CFI_DRIVER
 	help
 	  ARM Ltd reference designs flash partition access
 
@@ -1166,6 +1167,7 @@ config CMD_FPGA_LOAD_SECURE
 
 config CMD_FPGAD
 	bool "fpgad - dump FPGA registers"
+	depends on GDSYS_LEGACY_DRIVERS
 	help
 	  (legacy, needs conversion to driver model)
 	  Provides a way to dump FPGA registers by calling the board-specific
@@ -1601,6 +1603,7 @@ config CMD_TEMPERATURE
 
 config CMD_TSI148
 	bool "tsi148 - Command to access tsi148 device"
+	depends on DM_PCI_COMPAT
 	help
 	  This provides various sub-commands to initialise and configure the
 	  Turndra tsi148 device. See the command help for full details.
@@ -1614,6 +1617,7 @@ config CMD_UFS
 
 config CMD_UNIVERSE
 	bool "universe - Command to set up the Turndra Universe controller"
+	depends on DM_PCI_COMPAT
 	help
 	  This allows setting up the VMEbus provided by this controller.
 	  See the command help for full details.
env/Kconfig +1 -1
index 1f8e90af55e5..9641abe371a0 100644
@@ -312,7 +312,7 @@ config ENV_IS_IN_NVRAM
 
 config ENV_IS_IN_ONENAND
 	bool "Environment is in OneNAND"
-	depends on !CHAIN_OF_TRUST
+	depends on !CHAIN_OF_TRUST && CMD_ONENAND
 	help
 	  Define this if you want to put your local device's environment in
 	  OneNAND.
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 5/18 xtensa: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all xtensa architecture files and when needed add missing include files directly.

---
 arch/xtensa/cpu/cpu.c        | 2 +-
 arch/xtensa/cpu/exceptions.c | 2 +-
 arch/xtensa/lib/bootm.c      | 1 -
 arch/xtensa/lib/cache.c      | 1 -
 arch/xtensa/lib/time.c       | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)
arch/xtensa/cpu/cpu.c +1 -1
index 98d9753b7e34..abcd8f7984fa 100644
@@ -8,7 +8,7 @@
  * CPU specific code
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <init.h>
 #include <vsprintf.h>
arch/xtensa/cpu/exceptions.c +1 -1
index cf9af4326a29..206767094e9f 100644
@@ -10,12 +10,12 @@
  *  (Note that alloca is a special case and handled in start.S)
  */
 
-#include <common.h>
 #include <command.h>
 #include <irq_func.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/regs.h>
+#include <vsprintf.h>
 
 typedef void (*handler_t)(struct pt_regs *);
 
arch/xtensa/lib/bootm.c +0 -1
index 9780d46e9b89..1de06b7fb53d 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2014 Cadence Design Systems Inc.
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <command.h>
arch/xtensa/lib/cache.c +0 -1
index 4e0c0acc3bbe..e6a7f6827fc2 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2014 - 2016 Cadence Design Systems Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 
arch/xtensa/lib/time.c +0 -1
index 1c927d2a6a3c..c6739584bbf2 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2008 - 2013 Tensilica Inc.
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <time.h>
 #include <asm/global_data.h>
Signature · 1 line
2.34.1
author
#6 lore raw

PATCH 6/18 nios2: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all nios2 architecture files and when needed add missing include files directly.

---
 arch/nios2/cpu/cpu.c        | 2 +-
 arch/nios2/cpu/interrupts.c | 1 -
 arch/nios2/cpu/traps.c      | 2 +-
 arch/nios2/lib/bootm.c      | 1 -
 arch/nios2/lib/cache.c      | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)
arch/nios2/cpu/cpu.c +1 -1
index de7bfa947f11..792fa01ab9e2 100644
@@ -4,7 +4,7 @@
  * Scott McNutt <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <command.h>
 #include <cpu.h>
 #include <cpu_func.h>
arch/nios2/cpu/interrupts.c +0 -1
index 90cabb67571b..27093c4faa3d 100644
@@ -7,7 +7,6 @@
  * Scott McNutt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <irq_func.h>
 #include <asm/nios2.h>
arch/nios2/cpu/traps.c +1 -1
index 087a05097d9e..59690214f14e 100644
@@ -4,8 +4,8 @@
  * Scott McNutt <[email protected]>
  */
 
-#include <common.h>
 #include <hang.h>
+#include <stdio.h>
 #include <asm/ptrace.h>
 
 void trap_handler (struct pt_regs *regs)
arch/nios2/lib/bootm.c +0 -1
index 657a17c7204f..ce939ff5e15a 100644
@@ -4,7 +4,6 @@
  * Scott McNutt <[email protected]>
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <cpu_func.h>
 #include <env.h>
arch/nios2/lib/cache.c +0 -1
index 5864d8f0f473..8f543f2a2f26 100644
@@ -5,7 +5,6 @@
  * Implemented by [email protected] and [email protected]
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
Signature · 1 line
2.34.1
author
#7 lore raw

PATCH 7/18 sh: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all sh architecture files and when needed add missing include files directly.

---
Cc: Marek Vasut <[email protected]>

---
 arch/sh/cpu/sh4/cache.c      | 1 -
 arch/sh/cpu/sh4/cpu.c        | 1 -
 arch/sh/cpu/sh4/interrupts.c | 1 -
 arch/sh/cpu/sh4/watchdog.c   | 1 -
 arch/sh/lib/board.c          | 2 +-
 arch/sh/lib/bootm.c          | 2 +-
 arch/sh/lib/time.c           | 1 -
 arch/sh/lib/time_sh2.c       | 1 -
 arch/sh/lib/zimageboot.c     | 2 +-
 9 files changed, 3 insertions(+), 9 deletions(-)
arch/sh/cpu/sh4/cache.c +0 -1
index 0f7dfdd3cf79..8c1839935ca1 100644
@@ -4,7 +4,6 @@
  * (C) Copyright 2007 Nobuhiro Iwamatsu <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
arch/sh/cpu/sh4/cpu.c +0 -1
index 1b2f50dbe6e4..b0ad685a91b1 100644
@@ -4,7 +4,6 @@
  * Nobuhiro Iwamatsu <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <irq_func.h>
 #include <cpu_func.h>
arch/sh/cpu/sh4/interrupts.c +0 -1
index 278a3e32ac91..eace09aeabfa 100644
@@ -4,7 +4,6 @@
  * Nobuhiro Iwamatsu <[email protected]>
  */
 
-#include <common.h>
 #include <irq_func.h>
 
 int interrupt_init(void)
arch/sh/cpu/sh4/watchdog.c +0 -1
index bf403d3c520e..c59743374657 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/processor.h>
 #include <asm/system.h>
arch/sh/lib/board.c +1 -1
index b31fa6d70311..53b1c147c2e3 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Vladimir Zapolskiy <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/global_data.h>
 
arch/sh/lib/bootm.c +1 -1
index 05d586b1b6ce..e298d766b52d 100644
@@ -7,7 +7,7 @@
  * (c) Copyright 2008 Renesas Solutions Corp.
  */
 
-#include <common.h>
+#include <config.h>
 #include <bootm.h>
 #include <command.h>
 #include <env.h>
arch/sh/lib/time.c +0 -1
index 19c8e3ca3e7b..5feb19835561 100644
@@ -10,7 +10,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/sh/lib/time_sh2.c +0 -1
index 5484c543c6c8..0ee7dc756ba6 100644
@@ -7,7 +7,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/io.h>
arch/sh/lib/zimageboot.c +1 -1
index c2e285ff0f62..e731c6a7cb36 100644
@@ -9,10 +9,10 @@
  * Linux SuperH zImage loading and boot
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <irq_func.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/zimage.h>
 
Signature · 1 line
2.34.1
author
#8 lore raw

PATCH 8/18 x86: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all x86 architecture files and when needed add missing include files directly.

---
Cc: Simon Glass <[email protected]>
Cc: Bin Meng <[email protected]>

---
 arch/x86/cpu/acpi_gpe.c                      | 2 +-
 arch/x86/cpu/apollolake/acpi.c               | 1 -
 arch/x86/cpu/apollolake/cpu.c                | 1 -
 arch/x86/cpu/apollolake/cpu_common.c         | 1 -
 arch/x86/cpu/apollolake/cpu_spl.c            | 1 -
 arch/x86/cpu/apollolake/fsp_bindings.c       | 1 -
 arch/x86/cpu/apollolake/fsp_m.c              | 1 -
 arch/x86/cpu/apollolake/fsp_s.c              | 1 -
 arch/x86/cpu/apollolake/hostbridge.c         | 1 -
 arch/x86/cpu/apollolake/lpc.c                | 1 -
 arch/x86/cpu/apollolake/pch.c                | 1 -
 arch/x86/cpu/apollolake/pmc.c                | 1 -
 arch/x86/cpu/apollolake/punit.c              | 2 +-
 arch/x86/cpu/apollolake/spl.c                | 1 -
 arch/x86/cpu/apollolake/systemagent.c        | 1 -
 arch/x86/cpu/apollolake/uart.c               | 1 -
 arch/x86/cpu/baytrail/acpi.c                 | 1 -
 arch/x86/cpu/baytrail/cpu.c                  | 1 -
 arch/x86/cpu/baytrail/early_uart.c           | 1 -
 arch/x86/cpu/baytrail/fsp_configs.c          | 1 -
 arch/x86/cpu/baytrail/valleyview.c           | 2 +-
 arch/x86/cpu/braswell/braswell.c             | 2 +-
 arch/x86/cpu/braswell/early_uart.c           | 1 -
 arch/x86/cpu/braswell/fsp_configs.c          | 1 -
 arch/x86/cpu/broadwell/adsp.c                | 1 -
 arch/x86/cpu/broadwell/cpu.c                 | 1 -
 arch/x86/cpu/broadwell/cpu_from_spl.c        | 2 +-
 arch/x86/cpu/broadwell/cpu_full.c            | 1 -
 arch/x86/cpu/broadwell/iobp.c                | 1 -
 arch/x86/cpu/broadwell/lpc.c                 | 1 -
 arch/x86/cpu/broadwell/me.c                  | 1 -
 arch/x86/cpu/broadwell/northbridge.c         | 1 -
 arch/x86/cpu/broadwell/pch.c                 | 1 -
 arch/x86/cpu/broadwell/pinctrl_broadwell.c   | 1 -
 arch/x86/cpu/broadwell/power_state.c         | 1 -
 arch/x86/cpu/broadwell/refcode.c             | 2 +-
 arch/x86/cpu/broadwell/sata.c                | 1 -
 arch/x86/cpu/broadwell/sdram.c               | 1 -
 arch/x86/cpu/coreboot/coreboot.c             | 1 -
 arch/x86/cpu/coreboot/coreboot_spl.c         | 1 -
 arch/x86/cpu/coreboot/sdram.c                | 2 +-
 arch/x86/cpu/coreboot/timestamp.c            | 2 +-
 arch/x86/cpu/cpu.c                           | 1 -
 arch/x86/cpu/cpu_x86.c                       | 1 -
 arch/x86/cpu/efi/app.c                       | 2 +-
 arch/x86/cpu/efi/payload.c                   | 3 ++-
 arch/x86/cpu/efi/sdram.c                     | 2 +-
 arch/x86/cpu/i386/cpu.c                      | 2 +-
 arch/x86/cpu/i386/interrupt.c                | 1 -
 arch/x86/cpu/intel_common/acpi.c             | 1 -
 arch/x86/cpu/intel_common/car.S              | 1 -
 arch/x86/cpu/intel_common/cpu.c              | 1 -
 arch/x86/cpu/intel_common/cpu_from_spl.c     | 1 -
 arch/x86/cpu/intel_common/fast_spi.c         | 1 -
 arch/x86/cpu/intel_common/generic_wifi.c     | 1 -
 arch/x86/cpu/intel_common/intel_opregion.c   | 1 -
 arch/x86/cpu/intel_common/itss.c             | 1 -
 arch/x86/cpu/intel_common/lpc.c              | 1 -
 arch/x86/cpu/intel_common/lpss.c             | 1 -
 arch/x86/cpu/intel_common/me_status.c        | 1 -
 arch/x86/cpu/intel_common/microcode.c        | 1 -
 arch/x86/cpu/intel_common/mrc.c              | 4 ++--
 arch/x86/cpu/intel_common/p2sb.c             | 1 -
 arch/x86/cpu/intel_common/pch.c              | 1 -
 arch/x86/cpu/intel_common/report_platform.c  | 2 +-
 arch/x86/cpu/ioapic.c                        | 1 -
 arch/x86/cpu/irq.c                           | 1 -
 arch/x86/cpu/ivybridge/bd82x6x.c             | 1 -
 arch/x86/cpu/ivybridge/cpu.c                 | 1 -
 arch/x86/cpu/ivybridge/early_me.c            | 1 -
 arch/x86/cpu/ivybridge/fsp_configs.c         | 1 -
 arch/x86/cpu/ivybridge/ivybridge.c           | 2 +-
 arch/x86/cpu/ivybridge/lpc.c                 | 1 -
 arch/x86/cpu/ivybridge/model_206ax.c         | 1 -
 arch/x86/cpu/ivybridge/northbridge.c         | 1 -
 arch/x86/cpu/ivybridge/sata.c                | 1 -
 arch/x86/cpu/ivybridge/sdram.c               | 1 -
 arch/x86/cpu/ivybridge/sdram_nop.c           | 2 +-
 arch/x86/cpu/lapic.c                         | 1 -
 arch/x86/cpu/mp_init.c                       | 2 +-
 arch/x86/cpu/mtrr.c                          | 1 -
 arch/x86/cpu/pci.c                           | 1 -
 arch/x86/cpu/qemu/cpu.c                      | 1 -
 arch/x86/cpu/qemu/dram.c                     | 2 +-
 arch/x86/cpu/qemu/e820.c                     | 1 -
 arch/x86/cpu/qemu/qemu.c                     | 2 +-
 arch/x86/cpu/qfw_cpu.c                       | 1 -
 arch/x86/cpu/quark/acpi.c                    | 2 +-
 arch/x86/cpu/quark/dram.c                    | 2 +-
 arch/x86/cpu/quark/hte.c                     | 1 -
 arch/x86/cpu/quark/mrc.c                     | 2 +-
 arch/x86/cpu/quark/mrc_util.c                | 2 +-
 arch/x86/cpu/quark/msg_port.c                | 1 -
 arch/x86/cpu/quark/quark.c                   | 2 +-
 arch/x86/cpu/quark/smc.c                     | 3 ++-
 arch/x86/cpu/queensbay/fsp_configs.c         | 1 -
 arch/x86/cpu/queensbay/tnc.c                 | 1 -
 arch/x86/cpu/slimbootloader/sdram.c          | 1 -
 arch/x86/cpu/slimbootloader/serial.c         | 1 -
 arch/x86/cpu/slimbootloader/slimbootloader.c | 1 -
 arch/x86/cpu/tangier/acpi.c                  | 1 -
 arch/x86/cpu/tangier/pinmux.c                | 1 -
 arch/x86/cpu/tangier/sdram.c                 | 2 +-
 arch/x86/cpu/tangier/sysreset.c              | 1 -
 arch/x86/cpu/tangier/tangier.c               | 1 -
 arch/x86/cpu/turbo.c                         | 1 -
 arch/x86/cpu/x86_64/cpu.c                    | 1 -
 arch/x86/cpu/x86_64/interrupts.c             | 1 -
 arch/x86/cpu/x86_64/misc.c                   | 1 -
 arch/x86/include/asm/arch-quark/mrc.h        | 2 ++
 arch/x86/include/asm/arch-quark/msg_port.h   | 2 ++
 arch/x86/include/asm/arch-quark/quark.h      | 2 ++
 arch/x86/include/asm/cb_sysinfo.h            | 1 +
 arch/x86/include/asm/coreboot_tables.h       | 2 ++
 arch/x86/include/asm/early_cmos.h            | 2 ++
 arch/x86/include/asm/handoff.h               | 2 ++
 arch/x86/include/asm/me_common.h             | 1 +
 arch/x86/include/asm/mp.h                    | 1 +
 arch/x86/lib/acpi.c                          | 1 -
 arch/x86/lib/acpi_nhlt.c                     | 1 -
 arch/x86/lib/acpi_s3.c                       | 1 -
 arch/x86/lib/acpi_table.c                    | 1 -
 arch/x86/lib/acpigen.c                       | 1 -
 arch/x86/lib/asm-offsets.c                   | 1 -
 arch/x86/lib/bdinfo.c                        | 1 -
 arch/x86/lib/bios.c                          | 1 -
 arch/x86/lib/bios_interrupts.c               | 1 -
 arch/x86/lib/bootm.c                         | 1 -
 arch/x86/lib/cmd_boot.c                      | 1 -
 arch/x86/lib/coreboot/cb_support.c           | 2 +-
 arch/x86/lib/coreboot/cb_sysinfo.c           | 2 +-
 arch/x86/lib/coreboot_table.c                | 1 -
 arch/x86/lib/div64.c                         | 2 +-
 arch/x86/lib/e820.c                          | 1 -
 arch/x86/lib/early_cmos.c                    | 1 -
 arch/x86/lib/fsp/fsp_common.c                | 1 -
 arch/x86/lib/fsp/fsp_dram.c                  | 1 -
 arch/x86/lib/fsp/fsp_graphics.c              | 1 -
 arch/x86/lib/fsp/fsp_support.c               | 1 -
 arch/x86/lib/fsp1/fsp_common.c               | 1 -
 arch/x86/lib/fsp1/fsp_dram.c                 | 1 -
 arch/x86/lib/fsp1/fsp_support.c              | 1 -
 arch/x86/lib/fsp2/fsp_common.c               | 1 -
 arch/x86/lib/fsp2/fsp_dram.c                 | 1 -
 arch/x86/lib/fsp2/fsp_init.c                 | 1 -
 arch/x86/lib/fsp2/fsp_meminit.c              | 1 -
 arch/x86/lib/fsp2/fsp_silicon_init.c         | 1 -
 arch/x86/lib/fsp2/fsp_support.c              | 1 -
 arch/x86/lib/hob.c                           | 1 -
 arch/x86/lib/i8254.c                         | 2 +-
 arch/x86/lib/i8259.c                         | 1 -
 arch/x86/lib/init_helpers.c                  | 2 +-
 arch/x86/lib/interrupts.c                    | 1 -
 arch/x86/lib/lpc-uclass.c                    | 1 -
 arch/x86/lib/mpspec.c                        | 1 -
 arch/x86/lib/mrccache.c                      | 1 -
 arch/x86/lib/northbridge-uclass.c            | 1 -
 arch/x86/lib/physmem.c                       | 1 -
 arch/x86/lib/pinctrl_ich6.c                  | 1 -
 arch/x86/lib/pirq_routing.c                  | 1 -
 arch/x86/lib/pmu.c                           | 1 -
 arch/x86/lib/ramtest.c                       | 2 +-
 arch/x86/lib/reloc_ia32_efi.c                | 1 -
 arch/x86/lib/reloc_x86_64_efi.c              | 1 -
 arch/x86/lib/relocate.c                      | 1 -
 arch/x86/lib/scu.c                           | 1 -
 arch/x86/lib/sfi.c                           | 1 -
 arch/x86/lib/spl.c                           | 2 +-
 arch/x86/lib/tables.c                        | 1 -
 arch/x86/lib/tpl.c                           | 1 -
 arch/x86/lib/zimage.c                        | 1 -
 include/acpi/acpi_s3.h                       | 3 +++
 172 files changed, 54 insertions(+), 163 deletions(-)
arch/x86/cpu/acpi_gpe.c +1 -1
index da01e71335f1..13fe695014be 100644
@@ -6,10 +6,10 @@
 
 #define LOG_CATEGORY	UCLASS_IRQ
 
-#include <common.h>
 #include <dm.h>
 #include <irq.h>
 #include <log.h>
+#include <time.h>
 #include <acpi/acpi_device.h>
 #include <asm/io.h>
 #include <dt-bindings/interrupt-controller/irq.h>
arch/x86/cpu/apollolake/acpi.c +0 -1
index c610a7f44770..76230aea837d 100644
@@ -10,7 +10,6 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
arch/x86/cpu/apollolake/cpu.c +0 -1
index 647c9df6a72b..f480bb1d8c34 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
arch/x86/cpu/apollolake/cpu_common.c +0 -1
index 9a5502617bf5..498b306cd618 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/cpu_common.h>
arch/x86/cpu/apollolake/cpu_spl.c +0 -1
index 8f48457ee220..8798fa79d4c1 100644
@@ -5,7 +5,6 @@
  * Portions taken from coreboot
  */
 
-#include <common.h>
 #include <dm.h>
 #include <ec_commands.h>
 #include <init.h>
arch/x86/cpu/apollolake/fsp_bindings.c +0 -1
index fb75e1f70951..f6fbddce922a 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 B&R Industrial Automation GmbH - http://www.br-automation.com
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/fsp_bindings.h>
arch/x86/cpu/apollolake/fsp_m.c +0 -1
index c6be707e4eaf..19065e17ae04 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/arch/iomap.h>
arch/x86/cpu/apollolake/fsp_s.c +0 -1
index a9b13c0c7047..5fca19f90d38 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <binman.h>
 #include <bootstage.h>
 #include <dm.h>
arch/x86/cpu/apollolake/hostbridge.c +0 -1
index 2405dec8525b..9ee362239efe 100644
@@ -11,7 +11,6 @@
 
 #define LOG_CATEGORY UCLASS_NORTHBRIDGE
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
arch/x86/cpu/apollolake/lpc.c +0 -1
index 4be6366f0438..531ff1cd91f4 100644
@@ -5,7 +5,6 @@
  * From coreboot Apollo Lake support lpc.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
arch/x86/cpu/apollolake/pch.c +0 -1
index a0f9b031dea3..32190312ff8c 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <pch.h>
 #include <spl.h>
arch/x86/cpu/apollolake/pmc.c +0 -1
index 163119e2e9e9..32fd0344861e 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_ACPI_PMC
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
arch/x86/cpu/apollolake/punit.c +1 -1
index 5ed7963579ea..b1503c25140a 100644
@@ -3,10 +3,10 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <spl.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
 #include <asm/intel_regs.h>
arch/x86/cpu/apollolake/spl.c +0 -1
index 6078d5a200e8..b351d73e7d8b 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <binman_sym.h>
 #include <bootstage.h>
 #include <dm.h>
arch/x86/cpu/apollolake/systemagent.c +0 -1
index b6bc2ba14f15..f966b9083fc2 100644
@@ -4,7 +4,6 @@
  * Take from coreboot project file of the same name
  */
 
-#include <common.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
 #include <asm/arch/systemagent.h>
arch/x86/cpu/apollolake/uart.c +0 -1
index a9362436000c..7e4c816dcef0 100644
@@ -7,7 +7,6 @@
  * Some code from coreboot lpss.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <malloc.h>
arch/x86/cpu/baytrail/acpi.c +0 -1
index ccc4851b1881..7821964f1fca 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <log.h>
arch/x86/cpu/baytrail/cpu.c +0 -1
index c270426d8208..7756a1a4a8e8 100644
@@ -5,7 +5,6 @@
  * Based on code from coreboot
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <event.h>
arch/x86/cpu/baytrail/early_uart.c +0 -1
index 08dbd5538f7a..3736127239e5 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <errno.h>
 #include <asm/io.h>
 
arch/x86/cpu/baytrail/fsp_configs.c +0 -1
index fb3f946c45f9..9eb456f90d10 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2015, Kodak Alaris, Inc
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
arch/x86/cpu/baytrail/valleyview.c +1 -1
index f73738ce5c01..839ff4d2bf21 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <mmc.h>
 #include <pci_ids.h>
@@ -11,6 +10,7 @@
 #include <asm/mrccache.h>
 #include <asm/post.h>
 #include <asm/arch/iomap.h>
+#include <asm/u-boot-x86.h>
 #include <linux/bitops.h>
 
 /* GPIO SUS */
arch/x86/cpu/braswell/braswell.c +1 -1
index 3345049993d6..8cf4b628d41a 100644
@@ -3,10 +3,10 @@
  * Copyright (C) 2017, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
+#include <asm/u-boot-x86.h>
 
 int arch_cpu_init(void)
 {
arch/x86/cpu/braswell/early_uart.c +0 -1
index d78c6b0feb6a..8b28d28d1366 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 
 #define PCI_DEV_CONFIG(segbus, dev, fn) ( \
arch/x86/cpu/braswell/fsp_configs.c +0 -1
index 243298fd5718..aaf3e67f81cc 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
arch/x86/cpu/broadwell/adsp.c +0 -1
index 1fa18237809c..90b2449475e5 100644
@@ -9,7 +9,6 @@
 
 #define LOG_CATEGORY UCLASS_SYSCON
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <pci.h>
arch/x86/cpu/broadwell/cpu.c +0 -1
index cbd4a3b67973..dc6717eca40e 100644
@@ -5,7 +5,6 @@
  * Based on code from coreboot src/soc/intel/broadwell/cpu.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <cpu.h>
 #include <event.h>
arch/x86/cpu/broadwell/cpu_from_spl.c +1 -1
index df5a9675ee4b..a48be2959943 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bloblist.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
@@ -13,6 +12,7 @@
 #include <log.h>
 #include <asm/global_data.h>
 #include <asm/mtrr.h>
+#include <linux/errno.h>
 
 int misc_init_r(void)
 {
arch/x86/cpu/broadwell/cpu_full.c +0 -1
index 2049dbfe24a5..c43fb7a608b4 100644
@@ -5,7 +5,6 @@
  * Based on code from coreboot src/soc/intel/broadwell/cpu.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <cpu.h>
 #include <init.h>
arch/x86/cpu/broadwell/iobp.c +0 -1
index cb5595c930e1..f8b2a60d09f1 100644
@@ -5,7 +5,6 @@
  * Modified from coreboot
  */
 
-#include <common.h>
 #include <errno.h>
 #include <asm/intel_regs.h>
 #include <asm/io.h>
arch/x86/cpu/broadwell/lpc.c +0 -1
index d2638a4e7a6b..b945693f1cf9 100644
@@ -5,7 +5,6 @@
  * From coreboot broadwell support
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
arch/x86/cpu/broadwell/me.c +0 -1
index ae16ce264992..3399d822e5b6 100644
@@ -5,7 +5,6 @@
  * Based on code from coreboot src/soc/intel/broadwell/me_status.c
  */
 
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <asm/arch/me.h>
arch/x86/cpu/broadwell/northbridge.c +0 -1
index 141babc51c3a..d67ab03627d1 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011 The Chromium Authors
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
arch/x86/cpu/broadwell/pch.c +0 -1
index 37fcddbb9b03..2c8b7380d962 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <pch.h>
arch/x86/cpu/broadwell/pinctrl_broadwell.c +0 -1
index 85bd37101ba2..b6313c3466a4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/broadwell/power_state.c +0 -1
index 62fd2e8d2c0e..e1d60915f55a 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2016 Google, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <pci.h>
 #include <asm/io.h>
arch/x86/cpu/broadwell/refcode.c +1 -1
index df2df7972e98..653d31dd67c5 100644
@@ -6,7 +6,7 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
+#include <config.h>
 #include <display_options.h>
 #include <errno.h>
 #include <init.h>
arch/x86/cpu/broadwell/sata.c +0 -1
index be3c9e764ef3..0f67ba9666f6 100644
@@ -5,7 +5,6 @@
  * From coreboot src/soc/intel/broadwell/sata.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
arch/x86/cpu/broadwell/sdram.c +0 -1
index d30ebee021ea..cd534a17cf15 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY UCLASS_RAM
 
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/x86/cpu/coreboot/coreboot.c +0 -1
index 82fe4c71cd27..d474c79e25ef 100644
@@ -5,7 +5,6 @@
  * Graeme Russ, [email protected].
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <event.h>
 #include <fdtdec.h>
arch/x86/cpu/coreboot/coreboot_spl.c +0 -1
index 36661871e923..566c65a96aed 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 Google LLC
  */
 
-#include <common.h>
 #include <init.h>
 
 int dram_init(void)
arch/x86/cpu/coreboot/sdram.c +1 -1
index 26352df421f7..ee0491eab1c8 100644
@@ -5,11 +5,11 @@
  * Graeme Russ, <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/e820.h>
 #include <asm/cb_sysinfo.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/cpu/coreboot/timestamp.c +1 -1
index 3ad611a530c4..ec4003c4e77e 100644
@@ -5,10 +5,10 @@
  * Modified from the coreboot version
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <asm/arch/timestamp.h>
 #include <asm/cb_sysinfo.h>
+#include <asm/u-boot-x86.h>
 #include <linux/compiler.h>
 
 static struct timestamp_table *ts_table  __section(".data");
arch/x86/cpu/cpu.c +0 -1
index ce55efc454bf..c8433360f28e 100644
@@ -20,7 +20,6 @@
 
 #define LOG_CATEGORY	UCLASS_CPU
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
arch/x86/cpu/cpu_x86.c +0 -1
index 59da41f38333..6c53f0ea821f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/cpu/efi/app.c +1 -1
index f754489784a7..218a68c4642d 100644
@@ -3,11 +3,11 @@
  * Copyright (c) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <netdev.h>
+#include <asm/u-boot-x86.h>
 
 int arch_cpu_init(void)
 {
arch/x86/cpu/efi/payload.c +2 -1
index 708bfbe7ee48..cb57f15f710b 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <efi.h>
 #include <efi_api.h>
@@ -17,6 +16,8 @@
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
+#include <asm/u-boot.h>
+#include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/cpu/efi/sdram.c +1 -1
index 56f3326146ca..1f0e87735b21 100644
@@ -3,10 +3,10 @@
  * Copyright (c) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <efi.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/cpu/i386/cpu.c +1 -1
index 8882532ebf3a..db2727d74851 100644
@@ -18,7 +18,6 @@
  * src/arch/x86/lib/cpu.c
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
@@ -32,6 +31,7 @@
 #include <asm/msr.h>
 #include <asm/mtrr.h>
 #include <asm/processor-flags.h>
+#include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/cpu/i386/interrupt.c +0 -1
index f3f3527237f2..b3f4214acdb7 100644
@@ -10,7 +10,6 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include <common.h>
 #include <dm.h>
 #include <efi_loader.h>
 #include <hang.h>
arch/x86/cpu/intel_common/acpi.c +0 -1
index d94ec208f65d..29676b4abfae 100644
@@ -8,7 +8,6 @@
  * Modified from coreboot src/soc/intel/common/block/acpi.c
  */
 
-#include <common.h>
 #include <bloblist.h>
 #include <cpu.h>
 #include <dm.h>
arch/x86/cpu/intel_common/car.S +0 -1
index 00308dbdef9b..46d9ede09cb0 100644
@@ -10,7 +10,6 @@
  * Copyright (C) 2012 Kyösti Mälkki <[email protected]>
  */
 
-#include <common.h>
 #include <asm/microcode.h>
 #include <asm/msr-index.h>
 #include <asm/mtrr.h>
arch/x86/cpu/intel_common/cpu.c +0 -1
index 8f489e6c651c..e7f419130429 100644
@@ -7,7 +7,6 @@
  * Some code taken from coreboot cpulib.c
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/cpu/intel_common/cpu_from_spl.c +0 -1
index 1c0dcedb5824..48b2ef253cbd 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <handoff.h>
arch/x86/cpu/intel_common/fast_spi.c +0 -1
index 5d3944dee2c8..e1d536be2122 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/cpu_common.h>
 #include <asm/fast_spi.h>
arch/x86/cpu/intel_common/generic_wifi.c +0 -1
index 61ec5391b094..75fa4e01d8ad 100644
@@ -6,7 +6,6 @@
  * Modified from coreboot src/drivers/wifi/generic.c
  */
 
-#include <common.h>
 #include <log.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
arch/x86/cpu/intel_common/intel_opregion.c +0 -1
index 1eed21d8cdf8..78caff0dc123 100644
@@ -6,7 +6,6 @@
  * Modified from coreboot src/soc/intel/gma/opregion.c
  */
 
-#include <common.h>
 #include <binman.h>
 #include <bloblist.h>
 #include <dm.h>
arch/x86/cpu/intel_common/itss.c +0 -1
index ec73b3d89312..6d3184f969f9 100644
@@ -9,7 +9,6 @@
  * Taken from coreboot itss.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <irq.h>
arch/x86/cpu/intel_common/lpc.c +0 -1
index af68c0f079c4..f2bdf8c1e878 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/intel_common/lpss.c +0 -1
index 26a2d2d1e36d..44cd3f0ca5f6 100644
@@ -7,7 +7,6 @@
  * Some code from coreboot lpss.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <pci.h>
 #include <asm/io.h>
arch/x86/cpu/intel_common/me_status.c +0 -1
index abc5f6fbc77b..a09bd5029ebb 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/arch/me.h>
 
arch/x86/cpu/intel_common/microcode.c +0 -1
index 4d8e1d210838..6cad2727075c 100644
@@ -6,7 +6,6 @@
  * Microcode update for Intel PIII and later CPUs
  */
 
-#include <common.h>
 #include <errno.h>
 #include <fdtdec.h>
 #include <log.h>
arch/x86/cpu/intel_common/mrc.c +2 -2
index ff959d1bd8d8..c834c05d1308 100644
@@ -5,17 +5,17 @@
 
 #define LOG_CATEGORY	UCLASS_RAM
 
-#include <common.h>
+#include <config.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
 #include <spl.h>
 #include <syscon.h>
+#include <time.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
 #include <asm/gpio.h>
 #include <asm/intel_regs.h>
-#include <asm/mrc_common.h>
 #include <asm/pch_common.h>
 #include <asm/post.h>
 #include <asm/arch/me.h>
arch/x86/cpu/intel_common/p2sb.c +0 -1
index e4e53f73c08d..7aad8f8ca56a 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY UCLASS_P2SB
 
-#include <common.h>
 #include <dm.h>
 #include <dt-structs.h>
 #include <log.h>
arch/x86/cpu/intel_common/pch.c +0 -1
index af82b64a13c7..c4cc478b3064 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/pch_common.h>
 
arch/x86/cpu/intel_common/report_platform.c +1 -1
index a3612817c45b..a7524435ba03 100644
@@ -5,12 +5,12 @@
  * Copyright (C) 2012 Google Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/cpu.h>
 #include <asm/pci.h>
 #include <asm/report_platform.h>
 #include <asm/arch/pch.h>
+#include <linux/string.h>
 
 static void report_cpu_info(void)
 {
arch/x86/cpu/ioapic.c +0 -1
index 4f99de6ece2b..fa912bac57dd 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/ioapic.h>
arch/x86/cpu/irq.c +0 -1
index 766b2451a2cc..d4dd1816092b 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/bd82x6x.c +0 -1
index 417290f559e9..8ae4798f125c 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2014 Google, Inc
  */
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/cpu.c +0 -1
index e71a10bfd441..d71ab0a6385e 100644
@@ -10,7 +10,6 @@
  * Copyright (C) 2011 Google Inc.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/cpu/ivybridge/early_me.c +0 -1
index bee1671baf8b..ac868025f8ed 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2011 The Chromium OS Authors. All rights reserved.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
arch/x86/cpu/ivybridge/fsp_configs.c +0 -1
index 3c4ea6c267f8..19b6ef283bc0 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
arch/x86/cpu/ivybridge/ivybridge.c +1 -1
index eb3f362e4e99..81b54bb8dda5 100644
@@ -3,10 +3,10 @@
  * Copyright (C) 2016, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/post.h>
 #include <asm/processor.h>
+#include <asm/u-boot-x86.h>
 
 int arch_cpu_init(void)
 {
arch/x86/cpu/ivybridge/lpc.c +0 -1
index f931d2be1b52..17a47edadbb8 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2008-2009 coresystems GmbH
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/model_206ax.c +0 -1
index 3906a69796f3..b72de96a277e 100644
@@ -6,7 +6,6 @@
  * Copyright (C) 2011 The Chromium Authors
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/northbridge.c +0 -1
index 994f8a4ff6a5..76e52f38ad83 100644
@@ -6,7 +6,6 @@
  * Copyright (C) 2011 The Chromium Authors
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <asm/global_data.h>
arch/x86/cpu/ivybridge/sata.c +0 -1
index f47ecdffae76..4e2484fa956d 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2008-2009 coresystems GmbH
  */
 
-#include <common.h>
 #include <ahci.h>
 #include <dm.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/sdram.c +0 -1
index 95a826da7130..bddec6c66b66 100644
@@ -11,7 +11,6 @@
 
 #define LOG_CATEGORY	UCLASS_RAM
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/cpu/ivybridge/sdram_nop.c +1 -1
index 51dfe23f94d0..e7ec35bbe2a6 100644
@@ -3,9 +3,9 @@
  * Copyright (c) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/cpu/lapic.c +0 -1
index c0691454f129..55b1b1833eed 100644
@@ -6,7 +6,6 @@
  * Copyright (C) 2014 Google, Inc
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/lapic.h>
arch/x86/cpu/mp_init.c +1 -1
index a133a5d81161..aa1f47d7227e 100644
@@ -5,13 +5,13 @@
  * Based on code from the coreboot file of the same name
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
 #include <qfw.h>
+#include <time.h>
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
arch/x86/cpu/mtrr.c +0 -1
index 9c24ae984e90..50cba5fb88dc 100644
@@ -16,7 +16,6 @@
  * since the MTRR registers are sometimes in flux.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <sort.h>
arch/x86/cpu/pci.c +0 -1
index 8a992ed82339..a7ad57f6de03 100644
@@ -8,7 +8,6 @@
  * Daniel Engström, Omicron Ceti AB, <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
arch/x86/cpu/qemu/cpu.c +0 -1
index 735b6560843a..0708a380626f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Miao Yan <[email protected]>
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/cpu/qemu/dram.c +1 -1
index d83abf005271..6ac363f3d8c7 100644
@@ -3,11 +3,11 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/post.h>
 #include <asm/arch/qemu.h>
+#include <asm/u-boot.h>
 #include <linux/sizes.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/cpu/qemu/e820.c +0 -1
index ebfe5956442a..17a04f86479e 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2019 Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <env_internal.h>
 #include <malloc.h>
 #include <asm/e820.h>
arch/x86/cpu/qemu/qemu.c +1 -1
index 70414556086c..262584d01f0f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <pci.h>
@@ -14,6 +13,7 @@
 #include <asm/processor.h>
 #include <asm/arch/device.h>
 #include <asm/arch/qemu.h>
+#include <asm/u-boot-x86.h>
 
 static bool i440fx;
 
arch/x86/cpu/qfw_cpu.c +0 -1
index ee00b8fe7327..468df5a36e61 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <malloc.h>
arch/x86/cpu/quark/acpi.c +1 -1
index 0e18ceab68d4..80e94600fc5a 100644
@@ -3,13 +3,13 @@
  * Copyright (C) 2016, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <mapmem.h>
 #include <acpi/acpi_table.h>
 #include <asm/processor.h>
 #include <asm/tables.h>
 #include <asm/arch/global_nvs.h>
 #include <asm/arch/iomap.h>
+#include <linux/string.h>
 
 static int quark_write_fadt(struct acpi_ctx *ctx,
 			    const struct acpi_writer *entry)
arch/x86/cpu/quark/dram.c +1 -1
index ad98f3e07bae..7d32b98e8daf 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <fdtdec.h>
@@ -18,6 +17,7 @@
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/cpu/quark/hte.c +0 -1
index df14779357d5..3cca6bd4c227 100644
@@ -7,7 +7,6 @@
  * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei
  */
 
-#include <common.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include "mrc_util.h"
arch/x86/cpu/quark/mrc.c +1 -1
index ce3c2b8ab426..be9c36b96c4f 100644
@@ -32,9 +32,9 @@
  * DRAM unit configuration based on Valleyview MRC.
  */
 
-#include <common.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/u-boot-x86.h>
 #include "mrc_util.h"
 #include "smc.h"
 
arch/x86/cpu/quark/mrc_util.c +1 -1
index b0bc59b71ef5..85408b3e3352 100644
@@ -7,12 +7,12 @@
  * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei
  */
 
-#include <common.h>
 #include <hang.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot-x86.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
arch/x86/cpu/quark/msg_port.c +0 -1
index d4f8c082ffc2..6261766cdf88 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
arch/x86/cpu/quark/quark.c +1 -1
index 62b83c228cfb..fdf92b2c0c3a 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <event.h>
 #include <init.h>
@@ -19,6 +18,7 @@
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
 #include <asm/arch/quark.h>
+#include <asm/u-boot-x86.h>
 #include <linux/delay.h>
 
 static void quark_setup_mtrr(void)
arch/x86/cpu/quark/smc.c +2 -1
index b4b3e1204bd5..a7e92b3f5c16 100644
@@ -7,11 +7,12 @@
  * QuarkSocPkg/QuarkNorthCluster/MemoryInit/Pei
  */
 
-#include <common.h>
 #include <pci.h>
 #include <asm/arch/device.h>
 #include <asm/arch/mrc.h>
 #include <asm/arch/msg_port.h>
+#include <asm/u-boot-x86.h>
+#include <linux/string.h>
 #include "mrc_util.h"
 #include "hte.h"
 #include "smc.h"
arch/x86/cpu/queensbay/fsp_configs.c +0 -1
index 381edd076158..3b5cbdb44f1a 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <asm/fsp1/fsp_support.h>
 
 void fsp_update_configs(struct fsp_config_data *config,
arch/x86/cpu/queensbay/tnc.c +0 -1
index 4a008622d19e..7c7eb413f993 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <dm/device-internal.h>
arch/x86/cpu/slimbootloader/sdram.c +0 -1
index fbb33b246e5b..75ca5273625c 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/sizes.h>
arch/x86/cpu/slimbootloader/serial.c +0 -1
index d28b280890d3..4c889dad6d2d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <ns16550.h>
arch/x86/cpu/slimbootloader/slimbootloader.c +0 -1
index ec5b87cfd63f..142c9341cf86 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <log.h>
arch/x86/cpu/tangier/acpi.c +0 -1
index 1d37cc9e2b0d..d4d0ef6f8552 100644
@@ -5,7 +5,6 @@
  * Partially based on acpi.c for other x86 platforms
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <mapmem.h>
arch/x86/cpu/tangier/pinmux.c +0 -1
index 23bfa7c18d2c..6afb8646a987 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018 Emlid Limited
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <dm/pinctrl.h>
arch/x86/cpu/tangier/sdram.c +1 -1
index 374b262b1348..7e1d290fc595 100644
@@ -3,12 +3,12 @@
  * Copyright (c) 2017 Intel Corporation
  */
 
-#include <common.h>
 #include <init.h>
 #include <log.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
 #include <asm/sfi.h>
+#include <asm/u-boot.h>
 #include <linux/printk.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/cpu/tangier/sysreset.c +0 -1
index b03bc28f9353..f57423a611d2 100644
@@ -5,7 +5,6 @@
  * Reset driver for tangier processor
  */
 
-#include <common.h>
 #include <dm.h>
 #include <sysreset.h>
 #include <asm/scu.h>
arch/x86/cpu/tangier/tangier.c +0 -1
index 1e2f6cc8b700..8a8f7d27a9d1 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2017 Intel Corporation
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <init.h>
 #include <asm/u-boot-x86.h>
arch/x86/cpu/turbo.c +0 -1
index e2c84cddec8e..c9b402c4dc73 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2011 The Chromium Authors.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/cpu.h>
 #include <asm/global_data.h>
arch/x86/cpu/x86_64/cpu.c +0 -1
index 5ea746ecce4d..80eab7103152 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <init.h>
arch/x86/cpu/x86_64/interrupts.c +0 -1
index 634f7660c03f..b84ff798814e 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <irq_func.h>
 #include <asm/processor-flags.h>
 
arch/x86/cpu/x86_64/misc.c +0 -1
index 691b67ff68ab..294511e6ebab 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/include/asm/arch-quark/mrc.h +2 -0
index 2353426cd6d2..40c92a549cdf 100644
@@ -10,6 +10,8 @@
 #ifndef _MRC_H_
 #define _MRC_H_
 
+#include <linux/types.h>
+
 #define MRC_VERSION	0x0111
 
 /* architectural definitions */
arch/x86/include/asm/arch-quark/msg_port.h +2 -0
index 9527fdad3fd4..98a9360d5435 100644
@@ -34,6 +34,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 /**
  * msg_port_setup - set up the message port control register
  *
arch/x86/include/asm/arch-quark/quark.h +2 -0
index feca1983ba89..dec30e2b27f3 100644
@@ -71,6 +71,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 /* variable range MTRR usage */
 enum {
 	MTRR_VAR_ROM,
arch/x86/include/asm/cb_sysinfo.h +1 -0
index 12fa395ffd28..5864b2700cec 100644
@@ -9,6 +9,7 @@
 #define _COREBOOT_SYSINFO_H
 
 #include <asm/coreboot_tables.h>
+#include <linux/types.h>
 
 /* Maximum number of memory range definitions */
 #define SYSINFO_MAX_MEM_RANGES	32
arch/x86/include/asm/coreboot_tables.h +2 -0
index 0dfb64babb96..c967e6ad0ce5 100644
@@ -8,6 +8,8 @@
 #ifndef _COREBOOT_TABLES_H
 #define _COREBOOT_TABLES_H
 
+#include <linux/types.h>
+
 struct timestamp_entry {
 	u32	entry_id;
 	u64	entry_stamp;
arch/x86/include/asm/early_cmos.h +2 -0
index 543a9e69f03a..007aeb7c23eb 100644
@@ -6,6 +6,8 @@
 #ifndef __EARLY_CMOS_H
 #define __EARLY_CMOS_H
 
+#include <linux/types.h>
+
 /* CMOS actually resides in the RTC SRAM */
 #define CMOS_IO_PORT	0x70
 
arch/x86/include/asm/handoff.h +2 -0
index aec49b9b815c..5f6691939eb5 100644
@@ -9,6 +9,8 @@
 #ifndef __x86_asm_handoff_h
 #define __x86_asm_handoff_h
 
+#include <linux/types.h>
+
 /**
  * struct arch_spl_handoff - architecture-specific handoff info
  *
arch/x86/include/asm/me_common.h +1 -0
index 857036831492..aa478594ec92 100644
@@ -13,6 +13,7 @@
 #define __ASM_ME_COMMON_H
 
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <pci.h>
 
arch/x86/include/asm/mp.h +1 -0
index f4c4d6c257c5..7c08f7a1d5c0 100644
@@ -11,6 +11,7 @@
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <linux/bitops.h>
+#include <linux/errno.h>
 
 struct udevice;
 
arch/x86/lib/acpi.c +0 -1
index 155fffabf080..a73a2539ad35 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
arch/x86/lib/acpi_nhlt.c +0 -1
index 08e13fdea67f..880ef31df7d9 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY	LOGC_ACPI
 
-#include <common.h>
 #include <binman.h>
 #include <dm.h>
 #include <log.h>
arch/x86/lib/acpi_s3.c +0 -1
index 2c70acbe7b0b..3a1e3318a15b 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <acpi/acpi_s3.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpi.h>
arch/x86/lib/acpi_table.c +0 -1
index a5683132b014..a42a7e6bbd65 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <bloblist.h>
 #include <cpu.h>
 #include <dm.h>
arch/x86/lib/acpigen.c +0 -1
index ea2ec2a90833..b486f8fb37d6 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Google LLC
  */
 
-#include <common.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_table.h>
 #include <asm/acpigen.h>
arch/x86/lib/asm-offsets.c +0 -1
index 8df67db65c39..7b2905dda56c 100644
@@ -11,7 +11,6 @@
  * #defines from the assembly-language output.
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <linux/kbuild.h>
 
arch/x86/lib/bdinfo.c +0 -1
index 124058442c55..165e8ab944f0 100644
@@ -5,7 +5,6 @@
  * Copyright 2021 Google LLC
  */
 
-#include <common.h>
 #include <efi.h>
 #include <init.h>
 #include <asm/cpu.h>
arch/x86/lib/bios.c +0 -1
index f146bbd54227..03f7360032c6 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2007 Advanced Micro Devices, Inc.
  * Copyright (C) 2009-2010 coresystems GmbH
  */
-#include <common.h>
 #include <compiler.h>
 #include <bios_emul.h>
 #include <irq_func.h>
arch/x86/lib/bios_interrupts.c +0 -1
index d6b4da7e2502..b2cf1527b1cd 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2007-2009 coresystems GmbH
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/pci.h>
 #include "bios_emul.h"
arch/x86/lib/bootm.c +0 -1
index 050c420e86b6..2c889bcd33c5 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2001  Erik Mouw ([email protected])
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <command.h>
arch/x86/lib/cmd_boot.c +0 -1
index 4facbe5f32fb..0444a5f89d3c 100644
@@ -14,7 +14,6 @@
  * Marius Groeger <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <asm/global_data.h>
arch/x86/lib/coreboot/cb_support.c +1 -1
index ebb45cdfb5b5..b4d5fa4af327 100644
@@ -5,9 +5,9 @@
  * Copyright 2021 Google LLC
  */
 
-#include <common.h>
 #include <asm/cb_sysinfo.h>
 #include <asm/e820.h>
+#include <linux/kernel.h>
 
 unsigned int cb_install_e820_map(unsigned int max_entries,
 				 struct e820_entry *entries)
arch/x86/lib/coreboot/cb_sysinfo.c +1 -1
index f7fd9ea5bcbb..ec997fa49cf2 100644
@@ -6,12 +6,12 @@
  * Copyright (C) 2009 coresystems GmbH
  */
 
-#include <common.h>
 #include <asm/cb_sysinfo.h>
 #include <init.h>
 #include <mapmem.h>
 #include <net.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/lib/coreboot_table.c +0 -1
index 05519d851a9d..33fce5d0a5e5 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <net.h>
 #include <vesa.h>
arch/x86/lib/div64.c +1 -1
index 2bea205f60f9..57da889ef49b 100644
@@ -6,7 +6,7 @@
  * Copyright 2014 Google Inc.
  */
 
-#include <common.h>
+#include <linux/types.h>
 
 union overlay64 {
 	u64 longw;
arch/x86/lib/e820.c +0 -1
index 12fcff123805..122b4f7ca01b 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <efi_loader.h>
 #include <asm/e820.h>
 #include <asm/global_data.h>
arch/x86/lib/early_cmos.c +0 -1
index f7b3bb2a8e19..5635d08718fa 100644
@@ -10,7 +10,6 @@
  * uclass write ops, that data is stored in little-endian mode.
  */
 
-#include <common.h>
 #include <asm/early_cmos.h>
 #include <asm/io.h>
 
arch/x86/lib/fsp/fsp_common.c +0 -1
index 8f2977a80709..c47e6ca47388 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/lib/fsp/fsp_dram.c +0 -1
index cc889a688d8a..730721dc1768 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <handoff.h>
 #include <init.h>
 #include <log.h>
arch/x86/lib/fsp/fsp_graphics.c +0 -1
index 09d5da8c841a..5f7701265a95 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY UCLASS_VIDEO
 
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/x86/lib/fsp/fsp_support.c +0 -1
index fd4d98ef6274..19f9f65b2e41 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/post.h>
arch/x86/lib/fsp1/fsp_common.c +0 -1
index df18f4767562..ebf655a11439 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
arch/x86/lib/fsp1/fsp_dram.c +0 -1
index eee9ce54b1ce..f3a8134a3f2f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
arch/x86/lib/fsp1/fsp_support.c +0 -1
index d84c632f1407..6e311a12d20b 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
arch/x86/lib/fsp2/fsp_common.c +0 -1
index d802a86967d5..45a274c05123 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/fsp/fsp_support.h>
 
arch/x86/lib/fsp2/fsp_dram.c +0 -1
index a1432239cfc1..83c6d7bcc93f 100644
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY LOGC_ARCH
 
-#include <common.h>
 #include <handoff.h>
 #include <init.h>
 #include <log.h>
arch/x86/lib/fsp2/fsp_init.c +0 -1
index aadc08cf3c44..ecbadaae75cf 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <binman.h>
 #include <binman_sym.h>
 #include <bootstage.h>
arch/x86/lib/fsp2/fsp_meminit.c +0 -1
index 022e2cb64e5a..f4817830cc21 100644
@@ -6,7 +6,6 @@
  * Mostly taken from coreboot fsp2_0/memory_init.c
  */
 
-#include <common.h>
 #include <binman.h>
 #include <bootstage.h>
 #include <dm.h>
arch/x86/lib/fsp2/fsp_silicon_init.c +0 -1
index a96d2b183f6e..16d30c25a57a 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_NORTHBRIDGE
 
-#include <common.h>
 #include <binman.h>
 #include <bootstage.h>
 #include <dm.h>
arch/x86/lib/fsp2/fsp_support.c +0 -1
index b2c76582453f..808f0eb9d29c 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <log.h>
arch/x86/lib/hob.c +0 -1
index b35248e5fde7..46e83aa395ab 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2014, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <asm/hob.h>
 
 /**
arch/x86/lib/i8254.c +1 -1
index a8d1db188ece..8a590c6191fa 100644
@@ -4,10 +4,10 @@
  * Daniel Engström, Omicron Ceti AB, <[email protected]>
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/i8254.h>
 #include <asm/ibmpc.h>
+#include <linux/errno.h>
 
 #define TIMER1_VALUE		18	/* 15.6us */
 #define BEEP_FREQUENCY_HZ	440
arch/x86/lib/i8259.c +0 -1
index a0e3c0925738..465ff70146f7 100644
@@ -13,7 +13,6 @@
  * Programmable Interrupt Controllers.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/i8259.h>
arch/x86/lib/init_helpers.c +1 -1
index bf0c921577d1..bd0efde00c10 100644
@@ -4,11 +4,11 @@
  * Graeme Russ, <[email protected]>
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <linux/errno.h>
 #include <asm/mtrr.h>
+#include <asm/u-boot-x86.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/x86/lib/interrupts.c +0 -1
index ff52959ed285..f96b2bfd70ee 100644
@@ -29,7 +29,6 @@
  * Daniel Engström
  */
 
-#include <common.h>
 #include <command.h>
 #include <irq_func.h>
 #include <asm/interrupt.h>
arch/x86/lib/lpc-uclass.c +0 -1
index 67b931d3b289..4f89db4e5389 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 
 UCLASS_DRIVER(lpc) = {
arch/x86/lib/mpspec.c +0 -1
index 8e97d9ff36d9..5abd9288c2a3 100644
@@ -5,7 +5,6 @@
  * Adapted from coreboot src/arch/x86/boot/mpspec.c
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
arch/x86/lib/mrccache.c +0 -1
index 6494b8d26341..970704a8dd62 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY	UCLASS_RAM
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/lib/northbridge-uclass.c +0 -1
index 383888724841..1d1780535a2a 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/root.h>
 
arch/x86/lib/physmem.c +0 -1
index 382f768149f4..48cd1073c152 100644
@@ -8,7 +8,6 @@
  * Software Foundation.
  */
 
-#include <common.h>
 #include <log.h>
 #include <physmem.h>
 #include <asm/cpu.h>
arch/x86/lib/pinctrl_ich6.c +0 -1
index c93f245845de..d4f71c562f85 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
arch/x86/lib/pirq_routing.c +0 -1
index caeaec9287fe..5178940901c2 100644
@@ -5,7 +5,6 @@
  * Part of this file is ported from coreboot src/arch/x86/boot/pirq_routing.c
  */
 
-#include <common.h>
 #include <log.h>
 #include <pci.h>
 #include <asm/global_data.h>
arch/x86/lib/pmu.c +0 -1
index 083aec8d8dd7..2127257cd431 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2017 Intel Corporation
  */
-#include <common.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
arch/x86/lib/ramtest.c +1 -1
index 03385396325d..16cd6e49437c 100644
@@ -5,9 +5,9 @@
  * From Coreboot src/lib/ramtest.c
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/post.h>
+#include <vsprintf.h>
 
 static void write_phys(unsigned long addr, u32 value)
 {
arch/x86/lib/reloc_ia32_efi.c +0 -1
index d56cd50bd937..17ab54dc2469 100644
@@ -7,7 +7,6 @@
  * All rights reserved.
  */
 
-#include <common.h>
 #include <efi.h>
 #include <elf.h>
 
arch/x86/lib/reloc_x86_64_efi.c +0 -1
index 2694de711041..c7a21d9393d6 100644
@@ -9,7 +9,6 @@
  * All rights reserved.
  */
 
-#include <common.h>
 #include <efi.h>
 #include <elf.h>
 
arch/x86/lib/relocate.c +0 -1
index da819b9bdd2c..9ce56062d247 100644
@@ -14,7 +14,6 @@
  * Marius Groeger <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <relocate.h>
 #include <asm/global_data.h>
arch/x86/lib/scu.c +0 -1
index 90ef239bcd3d..02fed601fb65 100644
@@ -9,7 +9,6 @@
  *
  * This driver enables IPC channel to SCU.
  */
-#include <common.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
arch/x86/lib/sfi.c +0 -1
index 85e963b634b5..04d97327a4df 100644
@@ -12,7 +12,6 @@
  * See https://simplefirmware.org/ for details
  */
 
-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <asm/cpu.h>
arch/x86/lib/spl.c +1 -1
index c15f11f8cdf4..f761fbc8bc3b 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY	LOGC_BOOT
 
-#include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <dm.h>
@@ -29,6 +28,7 @@
 #include <asm/processor.h>
 #include <asm/qemu.h>
 #include <asm/spl.h>
+#include <asm/u-boot-x86.h>
 #include <asm-generic/sections.h>
 
 DECLARE_GLOBAL_DATA_PTR;
arch/x86/lib/tables.c +0 -1
index 1095dc92c5aa..45a70e927634 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY LOGC_ACPI
 
-#include <common.h>
 #include <bloblist.h>
 #include <log.h>
 #include <malloc.h>
arch/x86/lib/tpl.c +0 -1
index 273e9c8e1ca1..7c03dea07111 100644
@@ -5,7 +5,6 @@
 
 #define LOG_CATEGORY	LOGC_BOOT
 
-#include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
arch/x86/lib/zimage.c +0 -1
index d7403876c13d..73a21bc8f03b 100644
@@ -14,7 +14,6 @@
 
 #define LOG_CATEGORY	LOGC_BOOT
 
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <env.h>
include/acpi/acpi_s3.h +3 -0
index d3f271f948ea..f7bea9418552 100644
@@ -37,6 +37,9 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/errno.h>
+#include <linux/types.h>
+
 extern char __wakeup[];
 extern int __wakeup_size;
 
Signature · 1 line
2.34.1
author
#9 lore raw

PATCH 9/18 powerpc: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all powerpc architecture files and when needed add missing include files directly. This typically involves using <asm/u-boot.h> instead due to the difficult nested structure of the PowerPC includes themselves.

---
 arch/powerpc/cpu/mpc83xx/cpu.c                 | 1 -
 arch/powerpc/cpu/mpc83xx/ecc.c                 | 1 -
 arch/powerpc/cpu/mpc83xx/fdt.c                 | 1 -
 arch/powerpc/cpu/mpc83xx/interrupts.c          | 2 +-
 arch/powerpc/cpu/mpc83xx/law.c                 | 1 -
 arch/powerpc/cpu/mpc83xx/pci.c                 | 1 -
 arch/powerpc/cpu/mpc83xx/pcie.c                | 2 +-
 arch/powerpc/cpu/mpc83xx/qe_io.c               | 1 -
 arch/powerpc/cpu/mpc83xx/serdes.c              | 1 -
 arch/powerpc/cpu/mpc83xx/spd_sdram.c           | 2 +-
 arch/powerpc/cpu/mpc83xx/speed.c               | 2 +-
 arch/powerpc/cpu/mpc83xx/spl_minimal.c         | 2 +-
 arch/powerpc/cpu/mpc83xx/traps.c               | 1 -
 arch/powerpc/cpu/mpc85xx/b4860_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/b4860_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c      | 1 -
 arch/powerpc/cpu/mpc85xx/c29x_serdes.c         | 1 -
 arch/powerpc/cpu/mpc85xx/cmd_errata.c          | 2 +-
 arch/powerpc/cpu/mpc85xx/cpu.c                 | 1 -
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c      | 3 ++-
 arch/powerpc/cpu/mpc85xx/fdt.c                 | 2 +-
 arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 +-
 arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c  | 2 +-
 arch/powerpc/cpu/mpc85xx/interrupts.c          | 2 +-
 arch/powerpc/cpu/mpc85xx/liodn.c               | 2 +-
 arch/powerpc/cpu/mpc85xx/mp.c                  | 2 +-
 arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c      | 1 -
 arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c      | 1 -
 arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c      | 1 -
 arch/powerpc/cpu/mpc85xx/p1010_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p1021_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p1023_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p2020_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p2041_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/p2041_serdes.c        | 2 +-
 arch/powerpc/cpu/mpc85xx/p3041_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/p3041_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p4080_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/p4080_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/p5040_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/p5040_serdes.c        | 1 -
 arch/powerpc/cpu/mpc85xx/portals.c             | 1 -
 arch/powerpc/cpu/mpc85xx/qe_io.c               | 2 +-
 arch/powerpc/cpu/mpc85xx/speed.c               | 2 +-
 arch/powerpc/cpu/mpc85xx/spl_minimal.c         | 2 +-
 arch/powerpc/cpu/mpc85xx/t1024_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/t1024_serdes.c        | 2 +-
 arch/powerpc/cpu/mpc85xx/t1040_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/t1040_serdes.c        | 2 +-
 arch/powerpc/cpu/mpc85xx/t2080_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/t2080_serdes.c        | 2 +-
 arch/powerpc/cpu/mpc85xx/t4240_ids.c           | 2 +-
 arch/powerpc/cpu/mpc85xx/t4240_serdes.c        | 2 +-
 arch/powerpc/cpu/mpc85xx/tlb.c                 | 2 +-
 arch/powerpc/cpu/mpc85xx/traps.c               | 2 +-
 arch/powerpc/cpu/mpc8xxx/cpu.c                 | 1 -
 arch/powerpc/cpu/mpc8xxx/fdt.c                 | 1 -
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c             | 2 +-
 arch/powerpc/cpu/mpc8xxx/fsl_pamu.c            | 2 +-
 arch/powerpc/cpu/mpc8xxx/law.c                 | 2 +-
 arch/powerpc/cpu/mpc8xxx/pamu_table.c          | 2 +-
 arch/powerpc/cpu/mpc8xxx/srio.c                | 3 +--
 arch/powerpc/include/asm/cache.h               | 2 ++
 arch/powerpc/include/asm/fsl_dma.h             | 2 +-
 arch/powerpc/include/asm/fsl_serdes.h          | 1 +
 arch/powerpc/include/asm/immap_8xx.h           | 2 ++
 arch/powerpc/lib/bdinfo.c                      | 2 +-
 arch/powerpc/lib/bootm.c                       | 2 +-
 arch/powerpc/lib/cache.c                       | 1 -
 arch/powerpc/lib/extable.c                     | 1 -
 arch/powerpc/lib/interrupts.c                  | 2 +-
 arch/powerpc/lib/kgdb.c                        | 1 -
 arch/powerpc/lib/spl.c                         | 1 -
 arch/powerpc/lib/stack.c                       | 1 -
 arch/powerpc/lib/time.c                        | 1 -
 include/fsl_immap.h                            | 3 +++
 76 files changed, 50 insertions(+), 73 deletions(-)
arch/powerpc/cpu/mpc83xx/cpu.c +0 -1
index f6ffe295b8ed..e0be938ea982 100644
@@ -9,7 +9,6 @@
  * Derived from the MPC8260 and MPC85xx.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <net.h>
arch/powerpc/cpu/mpc83xx/ecc.c +0 -1
index 3e24752e2f6c..9ab5ea313d3a 100644
@@ -6,7 +6,6 @@
  * based on the contribution of Marian Balakowicz <[email protected]>
  */
 
-#include <common.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
 #include <command.h>
arch/powerpc/cpu/mpc83xx/fdt.c +0 -1
index 33b2151f878c..1bd4f2b3449d 100644
@@ -6,7 +6,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <clock_legacy.h>
 #include <asm/global_data.h>
 #include <linux/libfdt.h>
arch/powerpc/cpu/mpc83xx/interrupts.c +1 -1
index f9486678af33..6238eec605f2 100644
@@ -6,7 +6,7 @@
  * Copyright 2004 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <command.h>
 #include <irq_func.h>
 #include <mpc83xx.h>
arch/powerpc/cpu/mpc83xx/law.c +0 -1
index 5e02f4094bb1..ae60be9e8774 100644
@@ -3,7 +3,6 @@
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/fsl_law.h>
 #include <asm/mmu.h>
arch/powerpc/cpu/mpc83xx/pci.c +0 -1
index 65ef0497c2a1..6f378c4e221f 100644
@@ -6,7 +6,6 @@
  * with some bits from older board-specific PCI initialization.
  */
 
-#include <common.h>
 #include <init.h>
 #include <pci.h>
 #include <asm/bitops.h>
arch/powerpc/cpu/mpc83xx/pcie.c +1 -1
index 47ca74c5c356..feecf8a8193c 100644
@@ -7,7 +7,7 @@
  *          Anton Vorontsov <[email protected]>
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <clock_legacy.h>
 #include <pci.h>
 #include <mpc83xx.h>
arch/powerpc/cpu/mpc83xx/qe_io.c +0 -1
index 52360703a7da..256dbfe8a4bb 100644
@@ -6,7 +6,6 @@
  * based on source code of Shlomi Gridish
  */
 
-#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_83xx.h>
arch/powerpc/cpu/mpc83xx/serdes.c +0 -1
index d4848b2ec4d5..d3ca24422a59 100644
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <asm/io.h>
 #include <asm/fsl_mpc83xx_serdes.h>
 #include <linux/delay.h>
arch/powerpc/cpu/mpc83xx/spd_sdram.c +1 -1
index 6da8fc4381d1..37234e00abd0 100644
@@ -12,7 +12,7 @@
 
 #ifndef CONFIG_MPC83XX_SDRAM
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <time.h>
arch/powerpc/cpu/mpc83xx/speed.c +1 -1
index b7a87fec2f5b..bfc624232179 100644
@@ -8,7 +8,7 @@
 
 #ifndef CONFIG_CLK_MPC83XX
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <clock_legacy.h>
 #include <mpc83xx.h>
 #include <command.h>
arch/powerpc/cpu/mpc83xx/spl_minimal.c +1 -1
index b55bfaffcaed..7036e3fae0c8 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2008 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm-offsets.h>
 #include <clock_legacy.h>
 #include <mpc83xx.h>
arch/powerpc/cpu/mpc83xx/traps.c +0 -1
index 94e6323d7365..79ea1a9bb3c9 100644
@@ -11,7 +11,6 @@
  * exceptions
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
arch/powerpc/cpu/mpc85xx/b4860_ids.c +1 -1
index 013a171ed87b..39cfd20129ff 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/b4860_serdes.c +0 -1
index 8e18e12f6341..25fdb4b04211 100644
@@ -3,7 +3,6 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/bsc9132_serdes.c +0 -1
index 792133482740..9ebb3d838fa4 100644
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/c29x_serdes.c +0 -1
index e53dd43f31fe..bbe4a0dd62b0 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/cmd_errata.c +1 -1
index c7d473d4a1b4..01763b54e8af 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <command.h>
 #include <init.h>
 #include <linux/compiler.h>
arch/powerpc/cpu/mpc85xx/cpu.c +0 -1
index e8a3e82765fc..6356b0216380 100644
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <cpu_func.h>
 #include <clock_legacy.h>
 #include <display_options.h>
arch/powerpc/cpu/mpc85xx/cpu_init_early.c +2 -1
index a67f37e3af96..574510fa0883 100644
@@ -3,8 +3,9 @@
  * Copyright 2009-2012 Freescale Semiconductor, Inc
  */
 
-#include <common.h>
+#include <asm/ppc.h>
 #include <system-constants.h>
+#include <linux/types.h>
 #include <asm-offsets.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
arch/powerpc/cpu/mpc85xx/fdt.c +1 -1
index e26436bf5701..c56e98d4b49e 100644
@@ -6,7 +6,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <clock_legacy.h>
 #include <env.h>
 #include <log.h>
arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c +1 -1
index 9b6577e547e5..3383bb5c9b02 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <log.h>
 #include <asm/fsl_serdes.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c +1 -1
index 7c2de02c4c56..78316ea5ffe2 100644
@@ -3,7 +3,7 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <env.h>
 #include <log.h>
 #include <time.h>
arch/powerpc/cpu/mpc85xx/interrupts.c +1 -1
index bcbdfac02792..3c98768f22ea 100644
@@ -10,7 +10,7 @@
  * Xianghua Xiao ([email protected])
  */
 
-#include <common.h>
+#include <asm/ppc.h>
 #include <irq_func.h>
 #include <log.h>
 #include <time.h>
arch/powerpc/cpu/mpc85xx/liodn.c +1 -1
index 4b8844a4d960..af6731cbb3a4 100644
@@ -3,7 +3,7 @@
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <log.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
arch/powerpc/cpu/mpc85xx/mp.c +1 -1
index 7c47e415f05d..b638f24ed14c 100644
@@ -3,7 +3,7 @@
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <env.h>
 #include <log.h>
arch/powerpc/cpu/mpc85xx/mpc8536_serdes.c +0 -1
index cbcb57fe3a54..bafff2083b35 100644
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/mpc8544_serdes.c +0 -1
index a48f3c151285..ad979caf6a7d 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c +0 -1
index 479ee085d3ab..924afa096d18 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/p1010_serdes.c +0 -1
index 56e5ef6468c1..d38041ef5c2b 100644
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/p1021_serdes.c +0 -1
index 47f13e3c1cd7..ec0f14ae6a74 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/p1023_serdes.c +0 -1
index 7a8f653727ef..6d306d99c32d 100644
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/p2020_serdes.c +0 -1
index 8c5d82ae8ade..49626fc1d1b6 100644
@@ -4,7 +4,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/p2041_ids.c +1 -1
index 540a6e6e191f..67a21e15a64d 100644
@@ -3,7 +3,7 @@
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/p2041_serdes.c +1 -1
index 3eca3a69326f..d915665df8f5 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/p3041_ids.c +1 -1
index 8f645258a5fc..e5d600fa2a4d 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/p3041_serdes.c +0 -1
index ec8234c1c1e5..b1586f110e86 100644
@@ -3,7 +3,6 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/p4080_ids.c +1 -1
index db411162022b..250504128374 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/p4080_serdes.c +0 -1
index 463fa119c9b8..438fd446be36 100644
@@ -3,7 +3,6 @@
  * Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/io.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
arch/powerpc/cpu/mpc85xx/p5040_ids.c +1 -1
index bd05eae2551d..de1d372631bb 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <config.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/p5040_serdes.c +0 -1
index 2327b2c2a414..409f2ac938d1 100644
@@ -3,7 +3,6 @@
  * Copyright 2009-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/portals.c +0 -1
index 6b4cbddcdfe1..782874d79d7c 100644
@@ -3,7 +3,6 @@
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
 
arch/powerpc/cpu/mpc85xx/qe_io.c +1 -1
index 3cf41ca76d5b..c3f7493efc7e 100644
@@ -6,7 +6,7 @@
  * based on source code of Shlomi Gridish
  */
 
-#include <common.h>
+#include <config.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/immap_85xx.h>
arch/powerpc/cpu/mpc85xx/speed.c +1 -1
index 9af40310b46f..1a4ee87cb348 100644
@@ -9,7 +9,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <cpu_func.h>
 #include <clock_legacy.h>
 #include <ppc_asm.tmpl>
arch/powerpc/cpu/mpc85xx/spl_minimal.c +1 -1
index ce2b9c216677..e7031c1338b7 100644
@@ -3,7 +3,7 @@
  * Copyright 2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/processor.h>
 #include <asm/global_data.h>
 #include <fsl_ifc.h>
arch/powerpc/cpu/mpc85xx/t1024_ids.c +1 -1
index bab076b2b180..01a62b86926a 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/t1024_serdes.c +1 -1
index 16458e73be13..3ab743c3d628 100644
@@ -3,7 +3,7 @@
  * Copyright 2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/t1040_ids.c +1 -1
index 59f4f9c6692c..d0f9b0ca758a 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/t1040_serdes.c +1 -1
index 3a7fdef79c2e..1f1b23a3aaaf 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/t2080_ids.c +1 -1
index 390bb1153758..51ac367dd809 100644
@@ -3,7 +3,7 @@
  * Copyright 2013 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/t2080_serdes.c +1 -1
index 5f34aab4531e..16fa16b08081 100644
@@ -5,7 +5,7 @@
  * Shengzhou Liu <[email protected]>
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include "fsl_corenet2_serdes.h"
arch/powerpc/cpu/mpc85xx/t4240_ids.c +1 -1
index 37ea7788ccfc..94b4409cecad 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_portals.h>
 #include <asm/fsl_liodn.h>
 
arch/powerpc/cpu/mpc85xx/t4240_serdes.c +1 -1
index 61402e84ef62..956b5ea37aa5 100644
@@ -3,7 +3,7 @@
  * Copyright 2012 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <asm/fsl_serdes.h>
 #include <asm/processor.h>
 #include <asm/io.h>
arch/powerpc/cpu/mpc85xx/tlb.c +1 -1
index 2a78f0fe502c..e0b36f869a9c 100644
@@ -6,7 +6,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <display_options.h>
 #include <init.h>
 #include <asm/bitops.h>
arch/powerpc/cpu/mpc85xx/traps.c +1 -1
index 8f451b486248..db70f07500c5 100644
@@ -19,7 +19,7 @@
  * This file handles the architecture-dependent parts of hardware exceptions
  */
 
-#include <common.h>
+#include <asm/ppc.h>
 #include <asm/global_data.h>
 #include <asm/ptrace.h>
 #include <command.h>
arch/powerpc/cpu/mpc8xxx/cpu.c +0 -1
index 73d28f2a4e28..82f28749eb17 100644
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <init.h>
arch/powerpc/cpu/mpc8xxx/fdt.c +0 -1
index 300429024878..f1c1cbc1c3c6 100644
@@ -8,7 +8,6 @@
  * cpu specific common code for 85xx/86xx processors.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <linux/libfdt.h>
 #include <fdt_support.h>
arch/powerpc/cpu/mpc8xxx/fsl_lbc.c +1 -1
index 29489b46e6cd..c7bae5a88151 100644
@@ -3,7 +3,7 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <hang.h>
 #include <init.h>
 #include <asm/fsl_lbc.h>
arch/powerpc/cpu/mpc8xxx/fsl_pamu.c +1 -1
index 8e1f6c964d3f..523367ddf1c1 100644
@@ -5,7 +5,7 @@
  * Copyright 2012-2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <log.h>
 #include <linux/bitops.h>
 #include <linux/log2.h>
arch/powerpc/cpu/mpc8xxx/law.c +1 -1
index 35409dc8824c..5c6e26b9aa15 100644
@@ -6,7 +6,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <display_options.h>
 #include <asm/bitops.h>
 #include <asm/global_data.h>
arch/powerpc/cpu/mpc8xxx/pamu_table.c +1 -1
index b906279226a5..e55173a890b7 100644
@@ -3,7 +3,7 @@
  * Copyright 2012-2016 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
+#include <asm/u-boot.h>
 #include <log.h>
 #include <asm/fsl_pamu.h>
 #include <asm/global_data.h>
arch/powerpc/cpu/mpc8xxx/srio.c +1 -2
index c0b4a1217d33..185cbabbcd85 100644
@@ -3,8 +3,7 @@
  * Copyright 2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
-#include <config.h>
+#include <asm/u-boot.h>
 #include <log.h>
 #include <time.h>
 #include <asm/fsl_law.h>
arch/powerpc/include/asm/cache.h +2 -0
index b94faa5408e1..21dfce4c8c73 100644
@@ -39,6 +39,8 @@
 #endif
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
+#include <linux/types.h>
+
 extern void flush_dcache_range(unsigned long start, unsigned long stop);
 extern void clean_dcache_range(unsigned long start, unsigned long stop);
 extern void invalidate_dcache_range(unsigned long start, unsigned long stop);
arch/powerpc/include/asm/fsl_dma.h +1 -1
index 1459db74beea..e69e7dbefe88 100644
@@ -8,7 +8,7 @@
 #ifndef _ASM_FSL_DMA_H_
 #define _ASM_FSL_DMA_H_
 
-#include <asm/types.h>
+#include <linux/types.h>
 
 #ifdef CONFIG_MPC83xx
 typedef struct fsl_dma {
arch/powerpc/include/asm/fsl_serdes.h +1 -0
index ddde4f80c632..fdf761152333 100644
@@ -7,6 +7,7 @@
 #define __FSL_SERDES_H
 
 #include <config.h>
+#include <linux/types.h>
 
 enum srds_prtcl {
 	/*
arch/powerpc/include/asm/immap_8xx.h +2 -0
index cf1300f6e297..e11300cab20d 100644
@@ -12,6 +12,8 @@
 #ifndef __IMMAP_8XX__
 #define __IMMAP_8XX__
 
+#include <linux/types.h>
+
 /* System configuration registers.
 */
 typedef	struct sys_conf {
arch/powerpc/lib/bdinfo.c +1 -1
index 55dcad5df8e9..c12e4c6371fe 100644
@@ -6,9 +6,9 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
arch/powerpc/lib/bootm.c +1 -1
index 75c6bfd2bf81..f55b5ff8320e 100644
@@ -7,7 +7,7 @@
  */
 
 
-#include <common.h>
+#include <config.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <cpu_func.h>
arch/powerpc/lib/cache.c +0 -1
index c4c5c2d45138..e480b2696494 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <watchdog.h>
arch/powerpc/lib/extable.c +0 -1
index 7e9d4f22f390..fd45e8a790d9 100644
@@ -5,7 +5,6 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
-#include <common.h>
 #include <log.h>
 
 /*
arch/powerpc/lib/interrupts.c +1 -1
index df312dfa28ef..92b8a0bceacf 100644
@@ -7,7 +7,7 @@
  * Gleb Natapov <[email protected]>
  */
 
-#include <common.h>
+#include <asm/ppc.h>
 #include <irq_func.h>
 #include <asm/processor.h>
 #include <watchdog.h>
arch/powerpc/lib/kgdb.c +0 -1
index 8727d18884c4..20fcb7eef0ec 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <command.h>
 #include <kgdb.h>
 #include <asm/ptrace.h>
arch/powerpc/lib/spl.c +0 -1
index b638ea7be611..3a24cbfff3bc 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright 2012 Stefan Roese <[email protected]>
  */
-#include <common.h>
 #include <config.h>
 #include <log.h>
 #include <spl.h>
arch/powerpc/lib/stack.c +0 -1
index 2e731aa8701d..afd869e4ac30 100644
@@ -10,7 +10,6 @@
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
  * Marius Groeger <[email protected]>
  */
-#include <common.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <asm/mp.h>
arch/powerpc/lib/time.c +0 -1
index 8d6babfb83d6..0a0e75e726b0 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/io.h>
include/fsl_immap.h +3 -0
index 5297c0b3f9b6..54d6e0ab3772 100644
@@ -7,6 +7,9 @@
 
 #ifndef __FSL_IMMAP_H
 #define __FSL_IMMAP_H
+
+#include <linux/types.h>
+
 /*
  * DDR memory controller registers
  * This structure works for mpc83xx (DDR2 and DDR3), mpc85xx, mpc86xx.
Signature · 1 line
2.34.1
author
#10 lore raw

PATCH 10/18 test: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "test/" files and when needed add missing include files directly.

---
 include/adc.h                 | 2 ++
 include/audio_codec.h         | 2 ++
 include/axi.h                 | 2 ++
 include/bootmeth.h            | 2 ++
 include/bootstd.h             | 2 ++
 include/cedit.h               | 3 +++
 include/dm/test.h             | 2 ++
 test/bloblist.c               | 1 -
 test/boot/bootdev.c           | 1 -
 test/boot/bootflow.c          | 1 -
 test/boot/bootmeth.c          | 1 -
 test/boot/bootstd_common.c    | 1 -
 test/boot/cedit.c             | 1 -
 test/boot/expo.c              | 1 -
 test/boot/image.c             | 1 -
 test/boot/measurement.c       | 1 -
 test/boot/vbe_fixup.c         | 1 -
 test/boot/vbe_simple.c        | 1 -
 test/bootm.c                  | 1 -
 test/cmd/addrmap.c            | 1 -
 test/cmd/armffa.c             | 1 -
 test/cmd/bdinfo.c             | 1 -
 test/cmd/exit.c               | 1 -
 test/cmd/fdt.c                | 1 -
 test/cmd/font.c               | 1 -
 test/cmd/history.c            | 1 -
 test/cmd/loadm.c              | 1 -
 test/cmd/mem.c                | 1 -
 test/cmd/mem_search.c         | 1 -
 test/cmd/pci_mps.c            | 1 -
 test/cmd/pinmux.c             | 1 -
 test/cmd/rw.c                 | 1 -
 test/cmd/seama.c              | 1 -
 test/cmd/setexpr.c            | 1 -
 test/cmd/temperature.c        | 1 -
 test/cmd/test_echo.c          | 1 -
 test/cmd/test_pause.c         | 1 -
 test/cmd/wget.c               | 1 -
 test/cmd_ut.c                 | 2 +-
 test/command_ut.c             | 1 -
 test/common/cmd_ut_common.c   | 1 -
 test/common/cread.c           | 2 +-
 test/common/cyclic.c          | 1 -
 test/common/event.c           | 1 -
 test/common/test_autoboot.c   | 1 -
 test/compression.c            | 1 -
 test/dm/acpi.c                | 1 -
 test/dm/acpi_dp.c             | 1 -
 test/dm/acpigen.c             | 1 -
 test/dm/adc.c                 | 1 -
 test/dm/audio.c               | 1 -
 test/dm/axi.c                 | 1 -
 test/dm/blk.c                 | 1 -
 test/dm/blkmap.c              | 1 -
 test/dm/bootcount.c           | 1 -
 test/dm/bus.c                 | 1 -
 test/dm/button.c              | 1 -
 test/dm/cache.c               | 1 -
 test/dm/clk.c                 | 1 -
 test/dm/clk_ccf.c             | 1 -
 test/dm/core.c                | 1 -
 test/dm/cpu.c                 | 1 -
 test/dm/cros_ec.c             | 1 -
 test/dm/cros_ec_pwm.c         | 1 -
 test/dm/devres.c              | 1 -
 test/dm/dma.c                 | 1 -
 test/dm/dsi_host.c            | 1 -
 test/dm/efi_media.c           | 1 -
 test/dm/eth.c                 | 1 -
 test/dm/fastboot.c            | 1 -
 test/dm/fdtdec.c              | 1 -
 test/dm/ffa.c                 | 1 -
 test/dm/firmware.c            | 1 -
 test/dm/fwu_mdata.c           | 1 -
 test/dm/gpio.c                | 1 -
 test/dm/host.c                | 1 -
 test/dm/hwspinlock.c          | 1 -
 test/dm/i2c.c                 | 1 -
 test/dm/i2s.c                 | 1 -
 test/dm/iommu.c               | 1 -
 test/dm/irq.c                 | 1 -
 test/dm/k210_pll.c            | 1 -
 test/dm/led.c                 | 1 -
 test/dm/mailbox.c             | 1 -
 test/dm/mdio.c                | 1 -
 test/dm/mdio_mux.c            | 1 -
 test/dm/misc.c                | 1 -
 test/dm/mmc.c                 | 1 -
 test/dm/mux-cmd.c             | 2 +-
 test/dm/mux-emul.c            | 1 -
 test/dm/mux-mmio.c            | 1 -
 test/dm/nop.c                 | 1 -
 test/dm/nvmxip.c              | 1 -
 test/dm/of_extra.c            | 1 -
 test/dm/of_platdata.c         | 1 -
 test/dm/ofnode.c              | 1 -
 test/dm/ofread.c              | 1 -
 test/dm/osd.c                 | 1 -
 test/dm/p2sb.c                | 1 -
 test/dm/panel.c               | 1 -
 test/dm/part.c                | 1 -
 test/dm/pch.c                 | 1 -
 test/dm/pci.c                 | 1 -
 test/dm/pci_ep.c              | 1 -
 test/dm/phy.c                 | 1 -
 test/dm/phys2bus.c            | 1 -
 test/dm/pinmux.c              | 1 -
 test/dm/pmc.c                 | 1 -
 test/dm/pmic.c                | 1 -
 test/dm/power-domain.c        | 1 -
 test/dm/pwm.c                 | 1 -
 test/dm/qfw.c                 | 1 -
 test/dm/ram.c                 | 1 -
 test/dm/read.c                | 1 -
 test/dm/reboot-mode.c         | 1 -
 test/dm/regmap.c              | 2 +-
 test/dm/regulator.c           | 1 -
 test/dm/remoteproc.c          | 3 ++-
 test/dm/reset.c               | 1 -
 test/dm/rkmtd.c               | 1 -
 test/dm/rng.c                 | 1 -
 test/dm/rtc.c                 | 1 -
 test/dm/scmi.c                | 1 -
 test/dm/scsi.c                | 1 -
 test/dm/serial.c              | 1 -
 test/dm/sf.c                  | 1 -
 test/dm/simple-bus.c          | 1 -
 test/dm/simple-pm-bus.c       | 1 -
 test/dm/sm.c                  | 1 -
 test/dm/smem.c                | 1 -
 test/dm/soc.c                 | 1 -
 test/dm/sound.c               | 1 -
 test/dm/spi.c                 | 1 -
 test/dm/spmi.c                | 1 -
 test/dm/syscon-reset.c        | 1 -
 test/dm/syscon.c              | 1 -
 test/dm/sysinfo-gpio.c        | 1 -
 test/dm/sysinfo.c             | 1 -
 test/dm/sysreset.c            | 1 -
 test/dm/tag.c                 | 1 -
 test/dm/tee.c                 | 1 -
 test/dm/test-dm.c             | 1 -
 test/dm/test-driver.c         | 1 -
 test/dm/test-fdt.c            | 1 -
 test/dm/test-uclass.c         | 1 -
 test/dm/timer.c               | 1 -
 test/dm/tpm.c                 | 1 -
 test/dm/usb.c                 | 1 -
 test/dm/video.c               | 1 -
 test/dm/virtio.c              | 1 -
 test/dm/virtio_device.c       | 1 -
 test/dm/virtio_rng.c          | 1 -
 test/dm/wdt.c                 | 2 +-
 test/env/attr.c               | 1 -
 test/env/cmd_ut_env.c         | 1 -
 test/env/fdt.c                | 1 -
 test/env/hashtable.c          | 2 +-
 test/fuzz/cmd_fuzz.c          | 1 -
 test/fuzz/virtio.c            | 1 -
 test/image/spl_load.c         | 1 -
 test/image/spl_load_fs.c      | 1 -
 test/image/spl_load_net.c     | 1 -
 test/image/spl_load_nor.c     | 1 -
 test/image/spl_load_os.c      | 1 -
 test/image/spl_load_spi.c     | 1 -
 test/lib/abuf.c               | 1 -
 test/lib/asn1.c               | 1 -
 test/lib/cmd_ut_lib.c         | 1 -
 test/lib/efi_device_path.c    | 1 -
 test/lib/efi_image_region.c   | 1 -
 test/lib/getopt.c             | 1 -
 test/lib/hexdump.c            | 1 -
 test/lib/kconfig.c            | 1 -
 test/lib/kconfig_spl.c        | 1 -
 test/lib/lmb.c                | 1 -
 test/lib/longjmp.c            | 1 -
 test/lib/rsa.c                | 1 -
 test/lib/sscanf.c             | 1 -
 test/lib/string.c             | 1 -
 test/lib/strlcat.c            | 1 -
 test/lib/test_aes.c           | 1 -
 test/lib/test_crypt.c         | 1 -
 test/lib/test_errno_str.c     | 1 -
 test/lib/test_print.c         | 1 -
 test/lib/uuid.c               | 1 -
 test/log/cont_test.c          | 1 -
 test/log/log_filter.c         | 1 -
 test/log/log_test.c           | 1 -
 test/log/log_ut.c             | 1 -
 test/log/nolog_ndebug.c       | 1 -
 test/log/nolog_test.c         | 1 -
 test/log/pr_cont_test.c       | 1 -
 test/log/syslog_test.c        | 1 -
 test/log/syslog_test_ndebug.c | 1 -
 test/optee/cmd_ut_optee.c     | 1 -
 test/overlay/cmd_ut_overlay.c | 1 -
 test/print_ut.c               | 1 -
 test/stdint/int-types.c       | 2 +-
 test/str_ut.c                 | 1 -
 test/test-main.c              | 1 -
 test/time_ut.c                | 1 -
 test/unicode_ut.c             | 1 -
 test/ut.c                     | 1 -
 203 files changed, 24 insertions(+), 196 deletions(-)
include/adc.h +2 -0
index 0d1a666908f2..15e4cdb7dce7 100644
@@ -7,6 +7,8 @@
 #ifndef _ADC_H_
 #define _ADC_H_
 
+#include <stdbool.h>
+
 /* ADC_CHANNEL() - ADC channel bit mask, to select only required channels */
 #define ADC_CHANNEL(x)		(1 << x)
 
include/audio_codec.h +2 -0
index a81a31515765..a87b76c6f9ed 100644
@@ -7,6 +7,8 @@
 #ifndef __AUDIO_CODEC_H__
 #define __AUDIO_CODEC_H__
 
+#include <linux/types.h>
+
 struct udevice;
 
 /*
include/axi.h +2 -0
index 59fb0b2e4584..133a06ee2719 100644
@@ -7,6 +7,8 @@
 #ifndef _AXI_H_
 #define _AXI_H_
 
+#include <linux/types.h>
+
 struct udevice;
 
 /**
include/bootmeth.h +2 -0
index 0fc36104ece0..cd9517321c0a 100644
@@ -7,6 +7,8 @@
 #ifndef __bootmeth_h
 #define __bootmeth_h
 
+#include <linux/bitops.h>
+
 struct blk_desc;
 struct bootflow;
 struct bootflow_iter;
include/bootstd.h +2 -0
index 99ce7b64e7c5..ac756e98d84a 100644
@@ -10,6 +10,8 @@
 #define __bootstd_h
 
 #include <dm/ofnode_decl.h>
+#include <linux/list.h>
+#include <linux/types.h>
 
 struct udevice;
 
include/cedit.h +3 -0
index f43cafa5aa24..a31b42452477 100644
@@ -7,12 +7,15 @@
 #ifndef __CEDIT_H
 #define __CEDIT_H
 
+#include <stdbool.h>
 #include <dm/ofnode_decl.h>
+#include <linux/types.h>
 
 struct abuf;
 struct expo;
 struct scene;
 struct video_priv;
+struct udevice;
 
 enum {
 	/* size increment for writing FDT */
include/dm/test.h +2 -0
index b5937509212b..02737411a164 100644
@@ -6,6 +6,8 @@
 #ifndef __DM_TEST_H
 #define __DM_TEST_H
 
+#include <linux/types.h>
+
 struct udevice;
 
 /**
test/bloblist.c +0 -1
index 1c60bbac36c3..7c63682908a5 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018, Google Inc. All rights reserved.
  */
 
-#include <common.h>
 #include <bloblist.h>
 #include <log.h>
 #include <mapmem.h>
test/boot/bootdev.c +0 -1
index 0702fccdae60..6e940002f848 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootstd.h>
 #include <dm.h>
 #include <bootdev.h>
test/boot/bootflow.c +0 -1
index 674d4c05f83f..4511cfa7f9bf 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
test/boot/bootmeth.c +0 -1
index e498eee036eb..113b789ea793 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootmeth.h>
 #include <bootstd.h>
 #include <dm.h>
test/boot/bootstd_common.c +0 -1
index cc97e255e5cb..e50539500a02 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootstd.h>
 #include <dm.h>
test/boot/cedit.c +0 -1
index aa4171904864..fd19da0a0c0f 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <cedit.h>
 #include <env.h>
 #include <expo.h>
test/boot/expo.c +0 -1
index 714fdfa415d1..6ea0184373d5 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <expo.h>
test/boot/image.c +0 -1
index 2844b057859e..0894e30587f1 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <test/suites.h>
 #include <test/ut.h>
test/boot/measurement.c +0 -1
index 9db2ed324c2a..29be495412d3 100644
@@ -6,7 +6,6 @@
  * Written by Eddie James <[email protected]>
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <malloc.h>
 #include <test/suites.h>
test/boot/vbe_fixup.c +0 -1
index eba5c4ebe6c0..540816e42b00 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm/ofnode.h>
 #include <linux/libfdt.h>
 #include <test/test.h>
test/boot/vbe_simple.c +0 -1
index 5e61840652cf..3672b744e5fb 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootmeth.h>
 #include <dm.h>
 #include <image.h>
test/bootm.c +0 -1
index 4bb3ca0655cf..26c15552bf63 100644
@@ -5,7 +5,6 @@
  * Copyright 2020 Google LLC
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <asm/global_data.h>
 #include <test/suites.h>
test/cmd/addrmap.c +0 -1
index 1eb5955db172..7b8f49fd3751 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2021, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <test/suites.h>
 #include <test/ut.h>
test/cmd/armffa.c +0 -1
index 9a44a397e8a0..38f40b72f5e4 100644
@@ -8,7 +8,6 @@
  *   Abdellatif El Khlifi <[email protected]>
  */
 
-#include <common.h>
 #include <string.h>
 #include <asm/sandbox_arm_ffa.h>
 #include <dm/test.h>
test/cmd/bdinfo.c +0 -1
index 4977d01f62d6..027848c3e24c 100644
@@ -5,7 +5,6 @@
  * Copyright 2023 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
test/cmd/exit.c +0 -1
index 7e160f7e4bb7..d310ec8531be 100644
@@ -5,7 +5,6 @@
  * Copyright 2022 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
test/cmd/fdt.c +0 -1
index 547085521758..a0faf5aca904 100644
@@ -5,7 +5,6 @@
  * Copyright 2022 Google LLC
  */
 
-#include <common.h>
 #include <console.h>
 #include <fdt_support.h>
 #include <mapmem.h>
test/cmd/font.c +0 -1
index 1fe05c1ead51..a8905ce617e8 100644
@@ -5,7 +5,6 @@
  * Copyright 2022 Google LLC
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <video_console.h>
test/cmd/history.c +0 -1
index 06517fcdbb51..6964bfa9e1ec 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <cli.h>
 #include <command.h>
 #include <test/lib.h>
test/cmd/loadm.c +0 -1
index 41e005ac5923..dff8a97d1396 100644
@@ -9,7 +9,6 @@
  *   Rui Miguel Silva <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <mapmem.h>
 #include <asm/global_data.h>
test/cmd/mem.c +0 -1
index d76f47cf3115..f1bbab6055be 100644
@@ -5,7 +5,6 @@
  * Copyright 2020 Google LLC
  */
 
-#include <common.h>
 #include <command.h>
 #include <test/suites.h>
 #include <test/test.h>
test/cmd/mem_search.c +0 -1
index f80c9c406873..55ad2fac1e34 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <mapmem.h>
 #include <dm/test.h>
test/cmd/pci_mps.c +0 -1
index fd96f4fba6c4..2a64143eecd3 100644
@@ -7,7 +7,6 @@
  * Written by Stephen Carlson <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <test/suites.h>
 #include <test/ut.h>
test/cmd/pinmux.c +0 -1
index df40bb774355..4253baa56466 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2021, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <dm/test.h>
test/cmd/rw.c +0 -1
index 98302bf047b1..edd762e4d58f 100644
@@ -3,7 +3,6 @@
  * Tests for read and write commands
  */
 
-#include <common.h>
 #include <dm/test.h>
 #include <mapmem.h>
 #include <part.h>
test/cmd/seama.c +0 -1
index b1b56930c646..b60f6550b13c 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2021 Linus Walleij <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <test/suites.h>
test/cmd/setexpr.c +0 -1
index ee329e94b85b..d50ce5803c39 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <mapmem.h>
 #include <dm/test.h>
test/cmd/temperature.c +0 -1
index 2a1ea0611dc4..364972626b1f 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2022 Sartura Ltd.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <dm/test.h>
test/cmd/test_echo.c +0 -1
index 091e4f823c90..cde74ebeb616 100644
@@ -5,7 +5,6 @@
  * Copyright 2020, Heinrich Schuchadt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
 #include <display_options.h>
test/cmd/test_pause.c +0 -1
index 2b85cce32710..3703290350b3 100644
@@ -5,7 +5,6 @@
  * Copyright 2022, Samuel Dionne-Riel <[email protected]>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <test/lib.h>
 #include <test/ut.h>
test/cmd/wget.c +0 -1
index ed83fc94a5e2..356a4dcd8fad 100644
@@ -6,7 +6,6 @@
  * Ying-Chun Liu (PaulLiu) <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
test/cmd_ut.c +1 -1
index 0677ce0cd174..4e4aa8f1cb27 100644
@@ -4,9 +4,9 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
+#include <vsprintf.h>
 #include <test/suites.h>
 #include <test/test.h>
 #include <test/ut.h>
test/command_ut.c +0 -1
index a74bd109e153..2b8d28d7ae32 100644
@@ -5,7 +5,6 @@
 
 #define DEBUG
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
test/common/cmd_ut_common.c +0 -1
index 2c0267801b23..2f03a58af47c 100644
@@ -6,7 +6,6 @@
  * Unit tests for common functions
  */
 
-#include <common.h>
 #include <command.h>
 #include <test/common.h>
 #include <test/suites.h>
test/common/cread.c +1 -1
index 4edc77396043..e159caed0419 100644
@@ -3,8 +3,8 @@
  * Copyright 2023 Google LLC
  */
 
-#include <common.h>
 #include <cli.h>
+#include <time.h>
 #include <test/common.h>
 #include <test/test.h>
 #include <test/ut.h>
test/common/cyclic.c +0 -1
index 6e758e89dbdb..461f8cf91f45 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2022 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <cyclic.h>
 #include <dm.h>
 #include <test/common.h>
test/common/event.c +0 -1
index b462694fc3b6..de433d34f22b 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <event.h>
 #include <test/common.h>
test/common/test_autoboot.c +0 -1
index 42a1e4ab1fa0..4ba1dcc8091c 100644
@@ -6,7 +6,6 @@
  */
 
 #include <autoboot.h>
-#include <common.h>
 #include <test/common.h>
 #include <test/test.h>
 #include <test/ut.h>
test/compression.c +0 -1
index 3df90819a1fb..aa1d38bb7bc5 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013, The Chromium Authors
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <bootm.h>
 #include <command.h>
test/dm/acpi.c +0 -1
index f14b3962f845..4db2171a4b17 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <malloc.h>
test/dm/acpi_dp.c +0 -1
index 44bcabda6bc1..87bd8ae6749b 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <uuid.h>
 #include <acpi/acpigen.h>
test/dm/acpigen.c +0 -1
index 15b2b6f64a03..7113219792e6 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <irq.h>
 #include <malloc.h>
test/dm/adc.c +0 -1
index 740167e16b8e..a26a677074a4 100644
@@ -6,7 +6,6 @@
  * Przemyslaw Marczak <[email protected]>
  */
 
-#include <common.h>
 #include <adc.h>
 #include <dm.h>
 #include <dm/root.h>
test/dm/audio.c +0 -1
index add15ae20e00..3d1d821f3234 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <audio_codec.h>
 #include <dm.h>
 #include <dm/test.h>
test/dm/axi.c +0 -1
index dc029df5e443..0900a9b5485e 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <axi.h>
 #include <dm.h>
 #include <log.h>
test/dm/blk.c +0 -1
index 799f1e4dc75b..d03aec32f6c7 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <part.h>
test/dm/blkmap.c +0 -1
index 7a163d6eaef2..7581e62df3bb 100644
@@ -4,7 +4,6 @@
  * Author: Tobias Waldekranz <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <blkmap.h>
 #include <dm.h>
test/dm/bootcount.c +0 -1
index b77b472d1f26..9cfc7d48aac0 100644
@@ -3,7 +3,6 @@
  * (C) 2018 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <dm.h>
 #include <bootcount.h>
 #include <log.h>
test/dm/bus.c +0 -1
index 89a6aa6554cb..a338c7f567c1 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2014 Google, Inc
  */
 
-#include <common.h>
 #ifdef CONFIG_SANDBOX
 #include <log.h>
 #include <os.h>
test/dm/button.c +0 -1
index 830d96fbef34..9157ec928783 100644
@@ -5,7 +5,6 @@
  * Based on led.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <adc.h>
 #include <button.h>
test/dm/cache.c +0 -1
index bbd8f98d007b..d2f3bfe2caf3 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Intel Corporation <www.intel.com>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 
test/dm/clk.c +0 -1
index 57fabbdce08b..a966471dbd96 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <log.h>
test/dm/clk_ccf.c +0 -1
index 61dad8d85273..15fba31b962f 100644
@@ -4,7 +4,6 @@
  * Lukasz Majewski, DENX Software Engineering, [email protected]
  */
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <asm/clk.h>
test/dm/core.c +0 -1
index 7f3f8d183bca..4741c81bcc1d 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <fdtdec.h>
test/dm/cpu.c +0 -1
index 5734cd0a92d3..acba81059966 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <dm/test.h>
test/dm/cros_ec.c +0 -1
index 30cb70e08826..ac0055f0acd6 100644
@@ -3,7 +3,6 @@
  * Copyright 2021 Google LLC
  */
 
-#include <common.h>
 #include <cros_ec.h>
 #include <dm.h>
 #include <asm/test.h>
test/dm/cros_ec_pwm.c +0 -1
index f8d6e1e6c40f..f68ee6f33b8c 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <cros_ec.h>
 #include <dm.h>
 #include <pwm.h>
test/dm/devres.c +0 -1
index 3df0f64362dc..95a470b9f1c1 100644
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <log.h>
test/dm/dma.c +0 -1
index cce47cb21803..949710fdb4e3 100644
@@ -6,7 +6,6 @@
  * Grygorii Strashko <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <dm/test.h>
test/dm/dsi_host.c +0 -1
index 6e0a5df704f5..68686a40d9f9 100644
@@ -4,7 +4,6 @@
  * Author(s): Yannick Fertre <[email protected]> for STMicroelectronics.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dsi_host.h>
 #include <asm/state.h>
test/dm/efi_media.c +0 -1
index e343a0e9c85d..9d0ed0f07551 100644
@@ -5,7 +5,6 @@
  * Copyright 2021 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/test.h>
 #include <dm/test.h>
test/dm/eth.c +0 -1
index bb3dcc6b9540..820b8cbfc29d 100644
@@ -6,7 +6,6 @@
  * Joe Hershberger <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <fdtdec.h>
test/dm/fastboot.c +0 -1
index 758538d0e85e..5d938eb7f121 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fastboot.h>
 #include <fb_mmc.h>
test/dm/fdtdec.c +0 -1
index 087d4846da89..b484414f5f07 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/of_extra.h>
test/dm/ffa.c +0 -1
index 6912666bb465..fa6d54d00d61 100644
@@ -8,7 +8,6 @@
  *   Abdellatif El Khlifi <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <asm/sandbox_arm_ffa.h>
test/dm/firmware.c +0 -1
index f37bccfe4a83..ec68e816999d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Xilinx, Inc.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <syscon.h>
 #include <asm/test.h>
test/dm/fwu_mdata.c +0 -1
index 52018f610fe4..43ce3d0a9d87 100644
@@ -5,7 +5,6 @@
  */
 
 #include <blk.h>
-#include <common.h>
 #include <dm.h>
 #include <fwu.h>
 #include <fwu_mdata.h>
test/dm/gpio.c +0 -1
index 0d88ec24bda2..957ab25c8d34 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <dm.h>
 #include <log.h>
test/dm/host.c +0 -1
index ca05a36b3136..e514f8409cf6 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <fs.h>
test/dm/hwspinlock.c +0 -1
index 995759d4d7e2..a05b183b8bc1 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <dm.h>
 #include <hwspinlock.h>
 #include <asm/state.h>
test/dm/i2c.c +0 -1
index b46a22e79b14..e9cf9f7819a7 100644
@@ -5,7 +5,6 @@
  * Note: Test coverage does not include 10-bit addressing
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <i2c.h>
test/dm/i2s.c +0 -1
index c2bf4d5604b9..a3d3a31b6fbc 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <i2s.h>
 #include <asm/test.h>
test/dm/iommu.c +0 -1
index 62d38f1214ac..acea5f289715 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2021 Mark Kettenis <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
test/dm/irq.c +0 -1
index 51dd5e4abb41..d22772ab7693 100644
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <irq.h>
 #include <acpi/acpi_device.h>
test/dm/k210_pll.c +0 -1
index 354720f61e2f..2a581499634d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */
 #include <div64.h>
 #include <dm/test.h>
test/dm/led.c +0 -1
index eed3f4654c56..c28fa044f459 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <led.h>
 #include <asm/gpio.h>
test/dm/mailbox.c +0 -1
index 7ad8a1cbba28..14f72d58d1cf 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <dm/test.h>
test/dm/mdio.c +0 -1
index f863c52645b2..7ececf37ccc0 100644
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
test/dm/mdio_mux.c +0 -1
index bfe3518221f4..33a7e9726094 100644
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <miiphy.h>
 #include <misc.h>
test/dm/misc.c +0 -1
index 8bdd8c64bca2..ad856fd01b6d 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <misc.h>
test/dm/mmc.c +0 -1
index b1eb8bee2f9d..c0abea797d9d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <mmc.h>
 #include <part.h>
test/dm/mux-cmd.c +1 -1
index 11c237b5da90..d4bb8befa384 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Texas Instruments Inc.
  * Pratyush Yadav <[email protected]>
  */
-#include <common.h>
 #include <dm.h>
 #include <mux.h>
 #include <mux-internal.h>
@@ -13,6 +12,7 @@
 #include <test/ut.h>
 #include <console.h>
 #include <rand.h>
+#include <time.h>
 
 #define BUF_SIZE		256
 
test/dm/mux-emul.c +0 -1
index c6aeeb7e1f1b..febd521104af 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
  * Pratyush Yadav <[email protected]>
  */
-#include <common.h>
 #include <dm.h>
 #include <mux.h>
 #include <mux-internal.h>
test/dm/mux-mmio.c +0 -1
index 27c881dabde2..3a871a19c7e2 100644
@@ -4,7 +4,6 @@
  * Jean-Jacques Hiblot <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <mux.h>
 #include <regmap.h>
test/dm/nop.c +0 -1
index f7d9a0f3df35..0c79431d9d80 100644
@@ -6,7 +6,6 @@
  * Jean-Jacques Hiblot <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/ofnode.h>
 #include <dm/lists.h>
test/dm/nvmxip.c +0 -1
index f0ad47d4efe9..537959a0930c 100644
@@ -8,7 +8,6 @@
  *   Abdellatif El Khlifi <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <console.h>
 #include <dm.h>
test/dm/of_extra.c +0 -1
index ac2d886892d9..3c31bfcd31f9 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/of_extra.h>
 #include <dm/test.h>
test/dm/of_platdata.c +0 -1
index a241c4279367..d4939e885162 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <dt-structs.h>
test/dm/ofnode.c +0 -1
index a5bc43aea4e7..39191d7f52b5 100644
@@ -16,7 +16,6 @@
  * behaviour of each ofnode function, since that is done by the normal ones.
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <dm.h>
 #include <log.h>
test/dm/ofread.c +0 -1
index 3523860d2b31..69d03c491073 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <test/ut.h>
test/dm/osd.c +0 -1
index 6279b391ca5e..cf4a3a545ed0 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <display_options.h>
 #include <dm.h>
 #include <video_osd.h>
test/dm/p2sb.c +0 -1
index df24709141ad..3ada1fcb3629 100644
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <p2sb.h>
 #include <asm/test.h>
test/dm/panel.c +0 -1
index 4d435a0d255c..8be7c397a462 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <backlight.h>
 #include <dm.h>
 #include <panel.h>
test/dm/part.c +0 -1
index d6e434581274..cabb31d18ca0 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <mmc.h>
 #include <part.h>
test/dm/pch.c +0 -1
index 53f7bbf180c9..b37b856d5dac 100644
@@ -3,7 +3,6 @@
  * Copyright 2018 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <pch.h>
 #include <asm/test.h>
test/dm/pci.c +0 -1
index 8c5e7da9e629..9b97f2e0544f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <asm/io.h>
 #include <asm/test.h>
test/dm/pci_ep.c +0 -1
index 9941abd4cebc..e82fc53f84b1 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019 Ramon Fried
  */
 
-#include <common.h>
 #include <dm.h>
 #include <hexdump.h>
 #include <pci_ep.h>
test/dm/phy.c +0 -1
index 0cf3689fdecb..d14117f6f7a9 100644
@@ -4,7 +4,6 @@
  * Written by Jean-Jacques Hiblot  <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <generic-phy.h>
 #include <log.h>
test/dm/phys2bus.c +0 -1
index 342f2fa8ebaa..1ee2150482c6 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Nicolas Saenz Julienne <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <phys2bus.h>
test/dm/pinmux.c +0 -1
index 6880b2d2cd9c..cfbe3ef5d1eb 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/pinctrl.h>
 #include <dm/test.h>
test/dm/pmc.c +0 -1
index e70227e7800b..bbad1ee27419 100644
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <dm.h>
 #include <power/acpi_pmc.h>
 #include <dm/test.h>
test/dm/pmic.c +0 -1
index ce671202fbc6..53a6f0369e87 100644
@@ -6,7 +6,6 @@
  * Przemyslaw Marczak <[email protected]>
  */
 
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <fdtdec.h>
test/dm/power-domain.c +0 -1
index 8604b5d72dc0..120a9059c8e6 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <malloc.h>
 #include <dm/test.h>
test/dm/pwm.c +0 -1
index dff626c771ac..80133347ec73 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <pwm.h>
 #include <asm/test.h>
test/dm/qfw.c +0 -1
index f3f356898308..3c354163ef3b 100644
@@ -3,7 +3,6 @@
  * Copyright 2021 Asherah Connor <[email protected]>
  */
 
-#include <common.h>
 #include <qfw.h>
 #include <dm.h>
 #include <asm/test.h>
test/dm/ram.c +0 -1
index f624343138d6..188c7c327584 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <ram.h>
 #include <asm/global_data.h>
test/dm/read.c +0 -1
index 7768aa296885..4ecf18110d0f 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Nicolas Saenz Julienne <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/device.h>
 #include <dm/ofnode.h>
test/dm/reboot-mode.c +0 -1
index fbb9c3a5426a..160b4da07f20 100644
@@ -3,7 +3,6 @@
  * (C) 2018 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <dm.h>
 #include <reboot-mode/reboot-mode.h>
 #include <env.h>
test/dm/regmap.c +1 -1
index 8560f2afc2d1..1398f8f6573e 100644
@@ -3,13 +3,13 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <mapmem.h>
 #include <regmap.h>
 #include <syscon.h>
 #include <rand.h>
+#include <time.h>
 #include <asm/test.h>
 #include <dm/test.h>
 #include <dm/devres.h>
test/dm/regulator.c +0 -1
index 86f4862d9dd0..9e45fd177b94 100644
@@ -6,7 +6,6 @@
  * Przemyslaw Marczak <[email protected]>
  */
 
-#include <common.h>
 #include <errno.h>
 #include <dm.h>
 #include <fdtdec.h>
test/dm/remoteproc.c +2 -1
index f6f9e509e27a..ef9e8e5a0df6 100644
@@ -3,7 +3,8 @@
  * (C) Copyright 2015
  * Texas Instruments Incorporated - https://www.ti.com/
  */
-#include <common.h>
+
+#include <config.h>
 #include <dm.h>
 #include <elf.h>
 #include <errno.h>
test/dm/reset.c +0 -1
index e2d6f456230c..d3158bf4a72e 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2016, NVIDIA CORPORATION.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
 #include <log.h>
test/dm/rkmtd.c +0 -1
index 3c3e8efa92f2..3dc9ca1add11 100644
@@ -8,7 +8,6 @@
  * Copyright (C) 2023 Johan Jonker <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <fs.h>
test/dm/rng.c +0 -1
index 6d1f68848d52..c8ed6cadf586 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2019, Linaro Limited
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <rng.h>
test/dm/rtc.c +0 -1
index bf97dbbd2f9e..a8aa41955c22 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <i2c.h>
test/dm/scmi.c +0 -1
index adf36ffaab1d..69fc900e3429 100644
@@ -12,7 +12,6 @@
  * unknown SCMI protocol ID.
  */
 
-#include <common.h>
 #include <clk.h>
 #include <dm.h>
 #include <reset.h>
test/dm/scsi.c +0 -1
index 380cfc88baba..5180159fb27d 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <part.h>
 #include <scsi.h>
test/dm/serial.c +0 -1
index 34b783e062e1..34c0d4db879a 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018, STMicroelectronics
  */
 
-#include <common.h>
 #include <log.h>
 #include <serial.h>
 #include <dm.h>
test/dm/sf.c +0 -1
index 17d43fef3bc3..0e3a0f13f9ec 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <fdtdec.h>
test/dm/simple-bus.c +0 -1
index 3530b47fac2f..8a730ba2fce4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2021, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <dm/simple_bus.h>
test/dm/simple-pm-bus.c +0 -1
index 792c74505806..9949cb34d596 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <dm/device-internal.h>
test/dm/sm.c +0 -1
index 7ebb0c9c85ed..4d95c2ad75bd 100644
@@ -5,7 +5,6 @@
  * Author: Alexey Romanov <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <sm.h>
 #include <sandbox-sm.h>
test/dm/smem.c +0 -1
index 289fb59ba136..adcbfe574ab9 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Ramon Fried <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <smem.h>
 #include <dm/test.h>
test/dm/soc.c +0 -1
index 8f6c97fa7908..cb0ac1545f7f 100644
@@ -6,7 +6,6 @@
  *	Dave Gerlach <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
test/dm/sound.c +0 -1
index 15d545ab5a34..f4e6215e6830 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <sound.h>
 #include <dm/test.h>
test/dm/spi.c +0 -1
index 325799bbf104..1ab2dd783249 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <spi.h>
test/dm/spmi.c +0 -1
index 97bb0eb30fc9..e10ae8db4d30 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2015 Mateusz Kulikowski <[email protected]>
  */
 
-#include <common.h>
 #include <fdtdec.h>
 #include <dm.h>
 #include <malloc.h>
test/dm/syscon-reset.c +0 -1
index eeaddf88392c..ba19504573f4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/test.h>
 #include <regmap.h>
test/dm/syscon.c +0 -1
index be2329723362..04d324e87d44 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <syscon.h>
test/dm/sysinfo-gpio.c +0 -1
index 2e494b3f3412..24a99dafb152 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2021 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <sysinfo.h>
test/dm/sysinfo.c +0 -1
index 96b3a8ebabac..7444a580df6e 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <dm/test.h>
test/dm/sysreset.c +0 -1
index 5aa69e046186..f3a859be7878 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <sysreset.h>
 #include <asm/state.h>
test/dm/tag.c +0 -1
index 8ae8a1fcd65b..bce8a35acfb5 100644
@@ -6,7 +6,6 @@
  *  Author: AKASHI Takahiro
  */
 
-#include <common.h>
 #include <dm/tag.h>
 #include <dm/test.h> /* DM_TEST() */
 #include <test/test.h> /* struct unit_test_state */
test/dm/tee.c +0 -1
index 7a11bf891389..bb02a9b3c98b 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 Linaro Limited
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
test/dm/test-dm.c +0 -1
index e73a1dd8f814..4bc2c45db61c 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <test/suites.h>
 #include <test/test.h>
 
test/dm/test-driver.c +0 -1
index 02cb974b0f74..851177c3018a 100644
@@ -6,7 +6,6 @@
  * Pavel Herrmann <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
test/dm/test-fdt.c +0 -1
index 72d0eb57e212..18c89eef43fc 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
test/dm/test-uclass.c +0 -1
index 067701734a08..9a80cc63667b 100644
@@ -6,7 +6,6 @@
  * Pavel Herrmann <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <dm.h>
test/dm/timer.c +0 -1
index 9f94d4769200..7fcefc42e595 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Thomas Chou <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <timer.h>
 #include <dm/test.h>
test/dm/tpm.c +0 -1
index cde933ab2848..0e413c0eedd0 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <tpm_api.h>
 #include <dm/test.h>
test/dm/usb.c +0 -1
index 7671ef156d84..9a571938b816 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <part.h>
test/dm/video.c +0 -1
index d907f681600b..7dfbeb9555d1 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bzlib.h>
 #include <dm.h>
 #include <gzip.h>
test/dm/virtio.c +0 -1
index 3e108cdc35d0..3efd7c74f427 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <virtio_types.h>
 #include <virtio.h>
test/dm/virtio_device.c +0 -1
index fdda4da41781..63dc53415b73 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <virtio_types.h>
 #include <virtio.h>
test/dm/virtio_rng.c +0 -1
index 8b9a04b1fdef..ab7d862d79ef 100644
@@ -4,7 +4,6 @@
  * Written by Andrew Scull <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <virtio_types.h>
 #include <virtio.h>
test/dm/wdt.c +1 -1
index 2bbebcdbf286..1df2da23c6c7 100644
@@ -3,9 +3,9 @@
  * Copyright 2017 Google, Inc
  */
 
-#include <common.h>
 #include <cyclic.h>
 #include <dm.h>
+#include <time.h>
 #include <wdt.h>
 #include <asm/gpio.h>
 #include <asm/state.h>
test/env/attr.c +0 -1
index 8d5c0f1c3df4..de5d5d4ee27c 100644
@@ -4,7 +4,6 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <env_attr.h>
 #include <test/env.h>
test/env/cmd_ut_env.c +0 -1
index d65a32179ce1..13e0998341e7 100644
@@ -4,7 +4,6 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <test/env.h>
 #include <test/suites.h>
test/env/fdt.c +0 -1
index 30bfa88c3550..c495ac7b307c 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <command.h>
 #include <env_attr.h>
 #include <test/env.h>
test/env/hashtable.c +1 -1
index 70102f9121c2..ccdf0138c4b8 100644
@@ -4,11 +4,11 @@
  * Roman Kapl, SYSGO, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <search.h>
 #include <stdio.h>
+#include <vsprintf.h>
 #include <test/env.h>
 #include <test/ut.h>
 
test/fuzz/cmd_fuzz.c +0 -1
index d0bc7b8d7b76..faa140433ff5 100644
@@ -5,7 +5,6 @@
  */
 
 #include <command.h>
-#include <common.h>
 #include <dm.h>
 #include <fuzzing_engine.h>
 #include <test/fuzz.h>
test/fuzz/virtio.c +0 -1
index 8a47667e7785..836eb9a2f660 100644
@@ -4,7 +4,6 @@
  * Written by Andrew Scull <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <virtio.h>
 #include <virtio_ring.h>
test/image/spl_load.c +0 -1
index e1036eff28ca..7cbad40ea0cd 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <imx_container.h>
 #include <mapmem.h>
test/image/spl_load_fs.c +0 -1
index a89189e1124c..935078bf67b4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
test/image/spl_load_net.c +0 -1
index 9d067a7a592f..4af6e21b8b98 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <spl.h>
 #include <test/spl.h>
test/image/spl_load_nor.c +0 -1
index de5686343b99..f53a6724e27f 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <spl.h>
 #include <asm/io.h>
test/image/spl_load_os.c +0 -1
index 26228a8a4a9c..7d5fb9b07e05 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <os.h>
 #include <spl.h>
test/image/spl_load_spi.c +0 -1
index 54a95465e239..80836dc0dffa 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <spi_flash.h>
 #include <spl.h>
test/lib/abuf.c +0 -1
index 42803b20e2a1..7c0481ab610b 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <mapmem.h>
 #include <test/lib.h>
test/lib/asn1.c +0 -1
index a66cdd77df0a..4842b7058ac5 100644
@@ -6,7 +6,6 @@
  * Unit test for asn1 compiler and asn1 decoder function via various parsers
  */
 
-#include <common.h>
 #include <command.h>
 #include <test/lib.h>
 #include <test/test.h>
test/lib/cmd_ut_lib.c +0 -1
index f1ac015b2c89..f98cb9b3c572 100644
@@ -5,7 +5,6 @@
  * Unit tests for library functions
  */
 
-#include <common.h>
 #include <command.h>
 #include <test/lib.h>
 #include <test/suites.h>
test/lib/efi_device_path.c +0 -1
index 24e2f23c5af5..290c8768fa4c 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2020 Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <efi_loader.h>
 #include <test/lib.h>
 #include <test/test.h>
test/lib/efi_image_region.c +0 -1
index 0b888f843378..3ca49dc4a2eb 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2020, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <efi_loader.h>
 #include <test/lib.h>
 #include <test/test.h>
test/lib/getopt.c +0 -1
index 3c68b93c8a59..388a076200b3 100644
@@ -6,7 +6,6 @@
  * posix/tst-getopt-cancel.c
  */
 
-#include <common.h>
 #include <getopt.h>
 #include <test/lib.h>
 #include <test/test.h>
test/lib/hexdump.c +0 -1
index 5dccf4388663..d531a830398d 100644
@@ -4,7 +4,6 @@
  * Mario Six, Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <hexdump.h>
 #include <test/lib.h>
 #include <test/test.h>
test/lib/kconfig.c +0 -1
index 3914f699659f..0c463bb794a5 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
test/lib/kconfig_spl.c +0 -1
index 8f8a3411b14f..3bd8abdf4b8e 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
test/lib/lmb.c +0 -1
index 7e4368de22e2..4b5b6e5e2098 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2018 Simon Goldschmidt
  */
 
-#include <common.h>
 #include <dm.h>
 #include <lmb.h>
 #include <log.h>
test/lib/longjmp.c +0 -1
index 201367a5a3a2..79d889bdd5fa 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2021, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
test/lib/rsa.c +0 -1
index 44f8ade226f4..40f70010c788 100644
@@ -6,7 +6,6 @@
  * Unit test for rsa_verify() function
  */
 
-#include <common.h>
 #include <command.h>
 #include <image.h>
 #include <test/lib.h>
test/lib/sscanf.c +0 -1
index 772e4b920425..9fe5521749fd 100644
@@ -9,7 +9,6 @@
  * Unit tests for sscanf() function
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <test/lib.h>
test/lib/string.c +0 -1
index 5dcf4d6db003..d08dbca92915 100644
@@ -9,7 +9,6 @@
  * This has to be considered in testing.
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <test/lib.h>
test/lib/strlcat.c +0 -1
index d8453fe78e2c..d1a0293271b0 100644
@@ -6,7 +6,6 @@
  * These tests adapted from glibc's string/test-strncat.c
  */
 
-#include <common.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
test/lib/test_aes.c +0 -1
index cbc712f7eda3..cfd9d8ca5a93 100644
@@ -5,7 +5,6 @@
  * Unit tests for aes functions
  */
 
-#include <common.h>
 #include <command.h>
 #include <hexdump.h>
 #include <rand.h>
test/lib/test_crypt.c +0 -1
index fb21edf97484..dcdadd992c15 100644
@@ -5,7 +5,6 @@
  * Unit test for crypt-style password hashing
  */
 
-#include <common.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>
test/lib/test_errno_str.c +0 -1
index 8a9f1fd9805a..67f76442b271 100644
@@ -9,7 +9,6 @@
  * This has to be considered in testing.
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <test/lib.h>
test/lib/test_print.c +0 -1
index 79b67c779321..c7fc50a1de17 100644
@@ -5,7 +5,6 @@
  * Copyright 2020, Heinrich Schuchadt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <asm/global_data.h>
test/lib/uuid.c +0 -1
index e24331a13668..0914f2c47e77 100644
@@ -8,7 +8,6 @@
  *   Abdellatif El Khlifi <[email protected]>
  */
 
-#include <common.h>
 #include <uuid.h>
 #include <test/lib.h>
 #include <test/test.h>
test/log/cont_test.c +0 -1
index de7b7f064cd5..036d44b9d73d 100644
@@ -5,7 +5,6 @@
  * Test continuation of log messages.
  */
 
-#include <common.h>
 #include <console.h>
 #include <asm/global_data.h>
 #include <test/log.h>
test/log/log_filter.c +0 -1
index b644b40a850d..9cc891dc48c1 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <console.h>
 #include <log.h>
 #include <asm/global_data.h>
test/log/log_test.c +0 -1
index c5abff80d111..855353a9c409 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <asm/global_data.h>
test/log/log_ut.c +0 -1
index 5aa3a1840045..6617ed8b1525 100644
@@ -5,7 +5,6 @@
  * Logging function tests.
  */
 
-#include <common.h>
 #include <console.h>
 #include <log.h>
 #include <test/log.h>
test/log/nolog_ndebug.c +0 -1
index bd9a4f408e7b..b714a16d2e7e 100644
@@ -5,7 +5,6 @@
  * Logging function tests for CONFIG_LOG=n without #define DEBUG
  */
 
-#include <common.h>
 #include <console.h>
 #include <log.h>
 #include <asm/global_data.h>
test/log/nolog_test.c +0 -1
index 4e52e5bed822..c4c0fa6cf81a 100644
@@ -8,7 +8,6 @@
 /* Needed for testing log_debug() */
 #define DEBUG 1
 
-#include <common.h>
 #include <console.h>
 #include <log.h>
 #include <asm/global_data.h>
test/log/pr_cont_test.c +0 -1
index df4520d28075..30f30d98fe14 100644
@@ -5,7 +5,6 @@
  * Test continuation of log messages using pr_cont().
  */
 
-#include <common.h>
 #include <console.h>
 #include <test/log.h>
 #include <test/test.h>
test/log/syslog_test.c +0 -1
index 4db649db8226..c4180f775b95 100644
@@ -10,7 +10,6 @@
 /* Override CONFIG_LOG_MAX_LEVEL */
 #define LOG_DEBUG
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <hexdump.h>
test/log/syslog_test_ndebug.c +0 -1
index 4438791044d0..b10e636812b5 100644
@@ -7,7 +7,6 @@
  * Invoke the test with: ./u-boot -d arch/sandbox/dts/test.dtb
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 #include <dm/device.h>
 #include <hexdump.h>
test/optee/cmd_ut_optee.c +0 -1
index c3887ab11d92..c6f50e0995ac 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2019, Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <fdt_support.h>
test/overlay/cmd_ut_overlay.c +0 -1
index 56a3df17138b..bcb29a26e216 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2016 Free Electrons
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <fdt_support.h>
test/print_ut.c +0 -1
index bb844d2542b7..bded2b6ebe5a 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2012, The Chromium Authors
  */
 
-#include <common.h>
 #include <command.h>
 #include <efi_api.h>
 #include <display_options.h>
test/stdint/int-types.c +1 -1
index f6d09e8643d6..9051e32c7ced 100644
@@ -1,4 +1,4 @@
-#include <common.h>
+#include <linux/types.h>
 
 int test_types(void)
 {
test/str_ut.c +0 -1
index fa9328ede501..389779859a3d 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 Google LLC
  */
 
-#include <common.h>
 #include <vsprintf.h>
 #include <test/suites.h>
 #include <test/test.h>
test/test-main.c +0 -1
index b7015d9f38dd..3fa6f6e32ec8 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <console.h>
 #include <cyclic.h>
test/time_ut.c +0 -1
index 80b82dbfd833..149c4b58f4a1 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <time.h>
test/unicode_ut.c +0 -1
index 47c3f52774cd..13e29c9b9e32 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2018 Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <charset.h>
 #include <command.h>
 #include <efi_loader.h>
test/ut.c +0 -1
index 628e9dc98050..ae99831ac8ff 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2013 Google, Inc
  */
 
-#include <common.h>
 #include <console.h>
 #include <malloc.h>
 #ifdef CONFIG_SANDBOX
Signature · 1 line
2.34.1
author
#11 lore raw

PATCH 11/18 cmd: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "cmd/" files and when needed add missing include files directly.

---
 cmd/2048.c                      | 2 +-
 cmd/ab_select.c                 | 1 -
 cmd/abootimg.c                  | 1 -
 cmd/acpi.c                      | 2 +-
 cmd/adc.c                       | 1 -
 cmd/addrmap.c                   | 1 -
 cmd/adtimg.c                    | 2 +-
 cmd/aes.c                       | 2 +-
 cmd/arm/exception64.c           | 1 -
 cmd/armffa.c                    | 1 -
 cmd/armflash.c                  | 2 +-
 cmd/axi.c                       | 1 -
 cmd/bcb.c                       | 2 +-
 cmd/bdinfo.c                    | 1 -
 cmd/bind.c                      | 1 -
 cmd/binop.c                     | 2 +-
 cmd/blk_common.c                | 2 +-
 cmd/blkcache.c                  | 2 +-
 cmd/blkmap.c                    | 1 -
 cmd/blob.c                      | 2 +-
 cmd/bloblist.c                  | 1 -
 cmd/bmp.c                       | 1 -
 cmd/boot.c                      | 2 +-
 cmd/bootcount.c                 | 1 -
 cmd/bootdev.c                   | 1 -
 cmd/bootflow.c                  | 1 -
 cmd/booti.c                     | 1 -
 cmd/bootm.c                     | 1 -
 cmd/bootmenu.c                  | 1 -
 cmd/bootmeth.c                  | 1 -
 cmd/bootstage.c                 | 2 +-
 cmd/bootz.c                     | 1 -
 cmd/broadcom/chimp_boot.c       | 1 -
 cmd/broadcom/chimp_handshake.c  | 1 -
 cmd/broadcom/nitro_image_load.c | 2 +-
 cmd/btrfs.c                     | 1 -
 cmd/button.c                    | 1 -
 cmd/cache.c                     | 1 -
 cmd/cat.c                       | 1 -
 cmd/cbfs.c                      | 2 +-
 cmd/cedit.c                     | 1 -
 cmd/clk.c                       | 1 -
 cmd/clone.c                     | 2 +-
 cmd/cls.c                       | 1 -
 cmd/config.c                    | 1 -
 cmd/conitrace.c                 | 1 -
 cmd/console.c                   | 1 -
 cmd/cpu.c                       | 1 -
 cmd/cramfs.c                    | 1 -
 cmd/cros_ec.c                   | 1 -
 cmd/cyclic.c                    | 3 ++-
 cmd/date.c                      | 1 -
 cmd/demo.c                      | 1 -
 cmd/dfu.c                       | 1 -
 cmd/diag.c                      | 1 -
 cmd/disk.c                      | 1 -
 cmd/dm.c                        | 1 -
 cmd/echo.c                      | 1 -
 cmd/eeprom.c                    | 2 +-
 cmd/efi.c                       | 1 -
 cmd/efi_common.c                | 1 -
 cmd/eficonfig.c                 | 1 -
 cmd/eficonfig_sbkey.c           | 1 -
 cmd/efidebug.c                  | 1 -
 cmd/elf.c                       | 1 -
 cmd/ethsw.c                     | 2 +-
 cmd/event.c                     | 1 -
 cmd/exit.c                      | 2 +-
 cmd/ext2.c                      | 1 -
 cmd/ext4.c                      | 1 -
 cmd/extension_board.c           | 1 -
 cmd/fastboot.c                  | 1 -
 cmd/fat.c                       | 1 -
 cmd/fdt.c                       | 1 -
 cmd/flash.c                     | 2 +-
 cmd/font.c                      | 1 -
 cmd/fpga.c                      | 1 -
 cmd/fpgad.c                     | 2 +-
 cmd/fs.c                        | 1 -
 cmd/fs_uuid.c                   | 1 -
 cmd/fuse.c                      | 2 +-
 cmd/gettime.c                   | 2 +-
 cmd/gpio.c                      | 1 -
 cmd/gpt.c                       | 1 -
 cmd/hash.c                      | 1 -
 cmd/help.c                      | 1 -
 cmd/history.c                   | 1 -
 cmd/host.c                      | 1 -
 cmd/i2c.c                       | 1 -
 cmd/ide.c                       | 1 -
 cmd/ini.c                       | 2 +-
 cmd/io.c                        | 2 +-
 cmd/iotrace.c                   | 2 +-
 cmd/irq.c                       | 1 -
 cmd/itest.c                     | 2 +-
 cmd/jffs2.c                     | 1 -
 cmd/kaslrseed.c                 | 1 -
 cmd/led.c                       | 1 -
 cmd/legacy-mtd-utils.c          | 1 -
 cmd/legacy_led.c                | 3 +--
 cmd/license.c                   | 1 -
 cmd/load.c                      | 1 -
 cmd/log.c                       | 1 -
 cmd/lsblk.c                     | 1 -
 cmd/lzmadec.c                   | 2 +-
 cmd/mbr.c                       | 2 +-
 cmd/mdio.c                      | 1 -
 cmd/mem.c                       | 2 +-
 cmd/meson/sm.c                  | 2 +-
 cmd/mii.c                       | 1 -
 cmd/misc.c                      | 1 -
 cmd/mmc.c                       | 2 +-
 cmd/mp.c                        | 2 +-
 cmd/mtd.c                       | 1 -
 cmd/mtdparts.c                  | 1 -
 cmd/mux.c                       | 1 -
 cmd/mvebu/bubt.c                | 1 -
 cmd/mvebu/comphy_rx_training.c  | 1 -
 cmd/nand.c                      | 1 -
 cmd/net.c                       | 1 -
 cmd/nvedit.c                    | 2 +-
 cmd/nvedit_efi.c                | 1 -
 cmd/nvme.c                      | 1 -
 cmd/onenand.c                   | 1 -
 cmd/optee_rpmb.c                | 1 -
 cmd/osd.c                       | 1 -
 cmd/panic.c                     | 2 +-
 cmd/part.c                      | 1 -
 cmd/pcap.c                      | 2 +-
 cmd/pci.c                       | 1 -
 cmd/pci_mps.c                   | 1 -
 cmd/pinmux.c                    | 1 -
 cmd/pmc.c                       | 1 -
 cmd/pmic.c                      | 1 -
 cmd/printf.c                    | 2 +-
 cmd/pvblock.c                   | 1 -
 cmd/pxe.c                       | 2 +-
 cmd/qfw.c                       | 1 -
 cmd/read.c                      | 2 +-
 cmd/reginfo.c                   | 1 -
 cmd/regulator.c                 | 1 -
 cmd/remoteproc.c                | 1 -
 cmd/riscv/sbi.c                 | 1 -
 cmd/rkmtd.c                     | 1 -
 cmd/rng.c                       | 1 -
 cmd/rockusb.c                   | 1 -
 cmd/rtc.c                       | 1 -
 cmd/sata.c                      | 1 -
 cmd/sb.c                        | 1 -
 cmd/scp03.c                     | 1 -
 cmd/scsi.c                      | 1 -
 cmd/seama.c                     | 1 -
 cmd/setexpr.c                   | 3 ++-
 cmd/sf.c                        | 2 +-
 cmd/sha1sum.c                   | 1 -
 cmd/sleep.c                     | 3 ++-
 cmd/smccc.c                     | 2 +-
 cmd/sound.c                     | 1 -
 cmd/source.c                    | 1 -
 cmd/spi.c                       | 1 -
 cmd/spl.c                       | 1 -
 cmd/stackprot_test.c            | 1 -
 cmd/strings.c                   | 2 +-
 cmd/sysboot.c                   | 2 +-
 cmd/temperature.c               | 1 -
 cmd/terminal.c                  | 1 -
 cmd/test.c                      | 2 +-
 cmd/thordown.c                  | 1 -
 cmd/ti/ddr3.c                   | 1 -
 cmd/ti/pd.c                     | 1 -
 cmd/time.c                      | 1 -
 cmd/timer.c                     | 2 +-
 cmd/tlv_eeprom.c                | 1 -
 cmd/tpm-common.c                | 1 -
 cmd/tpm-v1.c                    | 2 +-
 cmd/tpm-v2.c                    | 1 -
 cmd/tpm_test.c                  | 2 +-
 cmd/trace.c                     | 2 +-
 cmd/tsi148.c                    | 2 +-
 cmd/ubi.c                       | 1 -
 cmd/ubifs.c                     | 2 +-
 cmd/ufs.c                       | 2 +-
 cmd/universe.c                  | 2 +-
 cmd/unlz4.c                     | 2 +-
 cmd/unzip.c                     | 2 +-
 cmd/usb.c                       | 1 -
 cmd/usb_gadget_sdp.c            | 1 -
 cmd/usb_mass_storage.c          | 1 -
 cmd/vbe.c                       | 1 -
 cmd/version.c                   | 1 -
 cmd/video.c                     | 1 -
 cmd/virtio.c                    | 1 -
 cmd/w1.c                        | 1 -
 cmd/wdt.c                       | 1 -
 cmd/wol.c                       | 2 +-
 cmd/x86/cbsysinfo.c             | 1 -
 cmd/x86/fsp.c                   | 1 -
 cmd/x86/hob.c                   | 1 -
 cmd/x86/mtrr.c                  | 2 +-
 cmd/ximg.c                      | 1 -
 cmd/xxd.c                       | 1 -
 cmd/yaffs2.c                    | 1 -
 cmd/zfs.c                       | 1 -
 cmd/zip.c                       | 2 +-
 include/android_ab.h            | 2 ++
 205 files changed, 65 insertions(+), 205 deletions(-)
cmd/2048.c +1 -1
index fa60aa94aad8..42cd171b0e41 100644
@@ -3,10 +3,10 @@
 
 /* Console version of the game "2048" for GNU/Linux */
 
-#include <common.h>
 #include <cli.h>
 #include <command.h>
 #include <rand.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 #define SIZE 4
cmd/ab_select.c +0 -1
index bfb67b8236b6..faeb83816e58 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 The Android Open Source Project
  */
 
-#include <common.h>
 #include <android_ab.h>
 #include <command.h>
 #include <env.h>
cmd/abootimg.c +0 -1
index 2653b555b10a..88c77d999290 100644
@@ -5,7 +5,6 @@
  */
 
 #include <android_image.h>
-#include <common.h>
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
cmd/acpi.c +1 -1
index 928e5dc525e6..094d9d4e8586 100644
@@ -3,7 +3,6 @@
  * Copyright 2019 Google LLC
  * Written by Simon Glass <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <log.h>
@@ -11,6 +10,7 @@
 #include <acpi/acpi_table.h>
 #include <asm/acpi_table.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <dm/acpi.h>
 
 DECLARE_GLOBAL_DATA_PTR;
cmd/adc.c +0 -1
index 4cb18b66d4aa..f87f9785a114 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018 BayLibre, SAS
  * Author: Neil Armstrong <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <adc.h>
cmd/addrmap.c +0 -1
index bd23549f3a5f..f7e4d9206de5 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2021, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <addr_map.h>
 
cmd/adtimg.c +1 -1
index f4b5cbf35b97..53f33764fbe8 100644
@@ -7,8 +7,8 @@
 
 #include <command.h>
 #include <env.h>
+#include <vsprintf.h>
 #include <image-android-dt.h>
-#include <common.h>
 
 #define OPT_INDEX	"--index"
 
cmd/aes.c +1 -1
index 1264675aa01f..87ad1ab82b99 100644
@@ -5,13 +5,13 @@
  * Command for en/de-crypting block of memory with AES-[128/192/256]-CBC cipher.
  */
 
-#include <common.h>
 #include <command.h>
 #include <uboot_aes.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 
 u32 aes_get_key_len(char *command)
 {
cmd/arm/exception64.c +0 -1
index 589a23115b04..73d6c20ccace 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2018, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <linux/bitops.h>
 
cmd/armffa.c +0 -1
index 9585150b9627..181e31bc49ad 100644
@@ -5,7 +5,6 @@
  * Authors:
  *   Abdellatif El Khlifi <[email protected]>
  */
-#include <common.h>
 #include <arm_ffa.h>
 #include <command.h>
 #include <dm.h>
cmd/armflash.c +1 -1
index fdaea5ad811d..e292cf85c45d 100644
@@ -5,10 +5,10 @@
  *
  * Support for ARM Flash Partitions
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <flash.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 #define MAX_REGIONS 4
cmd/axi.c +0 -1
index 5620891db28b..3dbea0499dee 100644
@@ -9,7 +9,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <common.h>
 #include <axi.h>
 #include <command.h>
 #include <console.h>
cmd/bcb.c +1 -1
index f3b92564d10b..fe6d6cb2c381 100644
@@ -8,12 +8,12 @@
 #include <android_bootloader_message.h>
 #include <bcb.h>
 #include <command.h>
-#include <common.h>
 #include <display_options.h>
 #include <log.h>
 #include <part.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <vsprintf.h>
 #include <linux/err.h>
 
 enum bcb_cmd {
cmd/bdinfo.c +0 -1
index 79106caeec2e..437ac4e86309 100644
@@ -6,7 +6,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
cmd/bind.c +0 -1
index be0d4d2a7115..3a59eefd5c58 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2018 JJ Hiblot <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <dm/device-internal.h>
cmd/binop.c +1 -1
index 592e9146901b..10d91b5dbf2e 100644
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <hexdump.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 
 enum {
cmd/blk_common.c +1 -1
index 02ac92837b6c..4c05a4e0610e 100644
@@ -8,10 +8,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 
 int blk_common_cmd(int argc, char *const argv[], enum uclass_id uclass_id,
 		   int *cur_devnump)
cmd/blkcache.c +1 -1
index 1456654df6f5..dbd03df14dcf 100644
@@ -6,9 +6,9 @@
  */
 #include <command.h>
 #include <config.h>
-#include <common.h>
 #include <malloc.h>
 #include <part.h>
+#include <vsprintf.h>
 
 static int blkc_show(struct cmd_tbl *cmdtp, int flag,
 		     int argc, char *const argv[])
cmd/blkmap.c +0 -1
index ef74ebc0036c..164f80f1387d 100644
@@ -6,7 +6,6 @@
 
 #include <blk.h>
 #include <blkmap.h>
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <dm/device.h>
cmd/blob.c +1 -1
index 7c77c410d528..a3c1dc49224d 100644
@@ -4,9 +4,9 @@
  * Command for encapsulating/decapsulating blob of memory.
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
 #if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) || \
cmd/bloblist.c +0 -1
index 26548ecf847e..333ae558142c 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bloblist.h>
 #include <command.h>
 #include <asm/global_data.h>
cmd/bmp.c +0 -1
index 8f43a40dafdd..3b6184486245 100644
@@ -8,7 +8,6 @@
  * BMP handling routines
  */
 
-#include <common.h>
 #include <command.h>
 #include <image.h>
 #include <mapmem.h>
cmd/boot.c +1 -1
index 14839c1cedcc..23496cafdf5c 100644
@@ -7,9 +7,9 @@
 /*
  * Misc boot support
  */
-#include <common.h>
 #include <command.h>
 #include <net.h>
+#include <vsprintf.h>
 
 #ifdef CONFIG_CMD_GO
 
cmd/bootcount.c +0 -1
index 30ce5dba30d9..5e3b66e676b8 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <command.h>
 #include <bootcount.h>
 
cmd/bootdev.c +0 -1
index 471189cda480..fa7285ba25e1 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootstd.h>
cmd/bootflow.c +0 -1
index be5d7d8e743a..1588f277a4a0 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootm.h>
cmd/booti.c +0 -1
index b9637b3ec3d8..62b19e834366 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
cmd/bootm.c +0 -1
index 9737a2d28c03..545b0c3d8235 100644
@@ -7,7 +7,6 @@
 /*
  * Boot support
  */
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <env.h>
cmd/bootmenu.c +0 -1
index 78184fccab25..977a04b7d769 100644
@@ -5,7 +5,6 @@
 
 #include <charset.h>
 #include <cli.h>
-#include <common.h>
 #include <command.h>
 #include <ansi.h>
 #include <efi_config.h>
cmd/bootmeth.c +0 -1
index f5b01343c48c..ebf8b7e2530f 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootmeth.h>
 #include <bootstd.h>
cmd/bootstage.c +1 -1
index 77a4bc66ff43..5246924f39a4 100644
@@ -3,9 +3,9 @@
  * Copyright (c) 2012, Google Inc. All rights reserved.
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
+#include <vsprintf.h>
 
 static int do_bootstage_report(struct cmd_tbl *cmdtp, int flag, int argc,
 			       char *const argv[])
cmd/bootz.c +0 -1
index b6bb4aae72d4..55837a7599b9 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <command.h>
 #include <image.h>
cmd/broadcom/chimp_boot.c +0 -1
index 16f2b612c4db..ae0a81179d0a 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 Broadcom
  */
 
-#include <common.h>
 #include <command.h>
 #include <broadcom/chimp.h>
 
cmd/broadcom/chimp_handshake.c +0 -1
index a90a73a6d749..e27426719636 100644
@@ -3,7 +3,6 @@
  * Copyright 2020 Broadcom
  */
 
-#include <common.h>
 #include <command.h>
 #include <broadcom/chimp.h>
 
cmd/broadcom/nitro_image_load.c +1 -1
index 93b5cb4cebe6..289b184e9afd 100644
@@ -3,8 +3,8 @@
  * Copyright 2020 Broadcom
  */
 
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 
 #define FW_IMAGE_SIG	0xff123456
 #define CFG_IMAGE_SIG	0xcf54321a
cmd/btrfs.c +0 -1
index 2843835d08b8..69d1b1f830d5 100644
@@ -3,7 +3,6 @@
  * 2017 by Marek Behún <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <btrfs.h>
 #include <fs.h>
cmd/button.c +0 -1
index 1b45d0a2a035..3e6db3f5b8eb 100644
@@ -5,7 +5,6 @@
  * Based on led.c
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <button.h>
cmd/cache.c +0 -1
index b68d45b98bf2..0254ff17f9b2 100644
@@ -7,7 +7,6 @@
 /*
  * Cache support: switch on or off, get status
  */
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <linux/compiler.h>
cmd/cat.c +0 -1
index 18aa6ca7aa67..6828b7b364e5 100644
@@ -4,7 +4,6 @@
  * Roger Knecht <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 #include <malloc.h>
cmd/cbfs.c +1 -1
index 3cfc9eb27270..c1035461df15 100644
@@ -6,10 +6,10 @@
 /*
  * CBFS commands
  */
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <cbfs.h>
+#include <vsprintf.h>
 
 static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
cmd/cedit.c +0 -1
index 6352e6369d1e..fec67a8e3349 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <cedit.h>
 #include <command.h>
cmd/clk.c +0 -1
index 7bbcbfeda332..6fda6efb1cea 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2013 Xilinx, Inc.
  */
-#include <common.h>
 #include <command.h>
 #include <clk.h>
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
cmd/clone.c +1 -1
index a90620775712..1f3cff1836d1 100644
@@ -4,11 +4,11 @@
  *
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <part.h>
 #include <blk.h>
+#include <time.h>
 #include <vsprintf.h>
 
 #define BUFSIZE (1 * 1024 * 1024)
cmd/cls.c +0 -1
index 80d0558d4679..4bee8a18305c 100644
@@ -5,7 +5,6 @@
  *
  * cls - clear screen command
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <dm.h>
cmd/config.c +0 -1
index cf30841a3594..f0d2033c61f4 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Masahiro Yamada <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
cmd/conitrace.c +0 -1
index 9a1bc3518485..6cc113328ebc 100644
@@ -5,7 +5,6 @@
  *
  * Copyright (c) 2018, Heinrich Schuchardt <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <linux/delay.h>
 
cmd/console.c +0 -1
index 58c2cf1c8943..12fc92061a19 100644
@@ -7,7 +7,6 @@
 /*
  * Boot support
  */
-#include <common.h>
 #include <command.h>
 #include <iomux.h>
 #include <stdio_dev.h>
cmd/cpu.c +0 -1
index 245a82fa3eb4..9e323069b9e8 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2017 Álvaro Fernández Rojas <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu.h>
 #include <display_options.h>
cmd/cramfs.c +0 -1
index 57e2afa2472b..b57e28159261 100644
@@ -10,7 +10,6 @@
 /*
  * CRAMFS support
  */
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>
cmd/cros_ec.c +0 -1
index 90921cecf602..7b60e415b6c9 100644
@@ -6,7 +6,6 @@
  * Copyright (c) 2016 National Instruments Corp
  */
 
-#include <common.h>
 #include <command.h>
 #include <cros_ec.h>
 #include <dm.h>
cmd/cyclic.c +2 -1
index ad7fc3b975e1..40e966de9aa5 100644
@@ -8,11 +8,12 @@
  * Copyright (C) 2022 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cyclic.h>
 #include <div64.h>
 #include <malloc.h>
+#include <time.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 struct cyclic_demo_info {
cmd/date.c +0 -1
index 4f98b470ca2e..755adec1e71e 100644
@@ -7,7 +7,6 @@
 /*
  * RTC, Date & Time support: get and set date & time
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <rtc.h>
cmd/demo.c +0 -1
index ebd5a241c362..5c422ac165bd 100644
@@ -6,7 +6,6 @@
  * Pavel Herrmann <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <dm-demo.h>
cmd/dfu.c +0 -1
index d7bfb535dc68..46f0190588e0 100644
@@ -10,7 +10,6 @@
  *	    Lukasz Majewski <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <watchdog.h>
 #include <dfu.h>
cmd/diag.c +0 -1
index f51536dbfaaf..c6da5aae3fcd 100644
@@ -7,7 +7,6 @@
 /*
  * Diagnostics support
  */
-#include <common.h>
 #include <command.h>
 #include <post.h>
 
cmd/disk.c +0 -1
index 92eaa02f4a13..2efc3ca4b1a2 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2000-2011
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <cpu_func.h>
cmd/dm.c +0 -1
index fb605c2da1a8..ec9cfd85376e 100644
@@ -6,7 +6,6 @@
  * Marek Vasut <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm/root.h>
 #include <dm/util.h>
cmd/echo.c +0 -1
index fda844ee9d35..973213a03a66 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_echo(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/eeprom.c +1 -1
index 322765ad02a0..26f3750a80ad 100644
@@ -19,12 +19,12 @@
  *
  */
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <eeprom.h>
 #include <i2c.h>
 #include <eeprom_layout.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 #ifndef	I2C_RXTX_LEN
cmd/efi.c +0 -1
index 6cd5361aca59..6bed2d743ba6 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <efi.h>
 #include <efi_api.h>
cmd/efi_common.c +0 -1
index 1aa2351fcdfd..c46764e6eea7 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <efi.h>
 #include <efi_api.h>
 #include <uuid.h>
cmd/eficonfig.c +0 -1
index 0ba92c60e039..4164cb4f9b80 100644
@@ -7,7 +7,6 @@
 
 #include <ansi.h>
 #include <cli.h>
-#include <common.h>
 #include <charset.h>
 #include <efi_loader.h>
 #include <efi_load_initrd.h>
cmd/eficonfig_sbkey.c +0 -1
index caca27495e02..b3325a540f9a 100644
@@ -6,7 +6,6 @@
  */
 
 #include <ansi.h>
-#include <common.h>
 #include <charset.h>
 #include <hexdump.h>
 #include <log.h>
cmd/efidebug.c +0 -1
index a587860e2a53..505f5bfa67d0 100644
@@ -6,7 +6,6 @@
  */
 
 #include <charset.h>
-#include <common.h>
 #include <command.h>
 #include <dm/device.h>
 #include <efi_dt_fixup.h>
cmd/elf.c +0 -1
index df4354d37428..a02361f9f512 100644
@@ -4,7 +4,6 @@
  * All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <elf.h>
cmd/ethsw.c +1 -1
index f8b8a798bf6a..4bf49ac598fc 100644
@@ -5,13 +5,13 @@
  * Ethernet Switch commands
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <errno.h>
 #include <env_flags.h>
 #include <ethsw.h>
 #include <net.h>
+#include <vsprintf.h>
 
 static const char *ethsw_name;
 
cmd/event.c +0 -1
index f6cdb55fc913..00c828757ca9 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <event.h>
 
cmd/exit.c +1 -1
index 7bf241ec732d..d125ec1e31f2 100644
@@ -4,8 +4,8 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 
 static int do_exit(struct cmd_tbl *cmdtp, int flag, int argc,
 		   char *const argv[])
cmd/ext2.c +0 -1
index a0ce0cf5796b..45c8b353b586 100644
@@ -19,7 +19,6 @@
 /*
  * Ext2fs support
  */
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 
cmd/ext4.c +0 -1
index 4791b69fd96d..40d1fe30d5ea 100644
@@ -25,7 +25,6 @@
  *	        file in uboot. Added ext4fs ls load and write support.
  */
 
-#include <common.h>
 #include <part.h>
 #include <config.h>
 #include <command.h>
cmd/extension_board.c +0 -1
index 2b672d888c68..f43bf680858f 100644
@@ -4,7 +4,6 @@
  * Köry Maincent, Bootlin, <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <command.h>
 #include <dm.h>
cmd/fastboot.c +0 -1
index c3c19231c988..d4cfc0c7a282 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2014 Linaro, Ltd.
  * Rob Herring <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <g_dnl.h>
cmd/fat.c +0 -1
index 69ce1fa5300b..ad0e5ed7d600 100644
@@ -7,7 +7,6 @@
 /*
  * Boot support
  */
-#include <common.h>
 #include <command.h>
 #include <mapmem.h>
 #include <fat.h>
cmd/fdt.c +0 -1
index 331564c13be9..d16b141ce32d 100644
@@ -7,7 +7,6 @@
  *   Matthew McClintock <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>
cmd/flash.c +1 -1
index f4f85ecc7a8e..de0e04f09cfb 100644
@@ -7,9 +7,9 @@
 /*
  * FLASH support
  */
-#include <common.h>
 #include <command.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <uuid.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
cmd/font.c +0 -1
index cb39c88063fb..ebde094b0a5b 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <video.h>
cmd/fpga.c +0 -1
index 8c64e957db0f..93f14098ccb6 100644
@@ -7,7 +7,6 @@
 /*
  *  FPGA support
  */
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <fpga.h>
cmd/fpgad.c +1 -1
index dfc6220b5e01..b4bfaa121657 100644
@@ -8,10 +8,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <display_options.h>
+#include <vsprintf.h>
 
 #include <gdsys_fpga.h>
 
cmd/fs.c +0 -1
index 46cb43dcdb5b..3d7e06d6f1e5 100644
@@ -5,7 +5,6 @@
  * Inspired by cmd_ext_common.c, cmd_fat.c.
  */
 
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 
cmd/fs_uuid.c +0 -1
index 5dc94aa64081..5f7770d09ac6 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2014, Bachmann electronic GmbH
  */
 
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 
cmd/fuse.c +1 -1
index f884c894fb00..598ef496a430 100644
@@ -8,11 +8,11 @@
  * Martha Marx <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <fuse.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <linux/errno.h>
 
 static int strtou32(const char *str, unsigned int base, u32 *result)
cmd/gettime.c +1 -1
index 2e74e02b4998..fc307efce8c2 100644
@@ -11,8 +11,8 @@
 /*
  * Get Timer overflows after 2^32 / CONFIG_SYS_HZ (32Khz) = 131072 sec
  */
-#include <common.h>
 #include <command.h>
+#include <time.h>
 
 static int do_gettime(struct cmd_tbl *cmdtp, int flag, int argc,
 		      char *const argv[])
cmd/gpio.c +0 -1
index dab6f7097aec..7a43dc6ab184 100644
@@ -6,7 +6,6 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
cmd/gpt.c +0 -1
index d7e96529a693..ddf9e0cf8d4b 100644
@@ -10,7 +10,6 @@
  * author: Piotr Wilczek <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <env.h>
 #include <log.h>
cmd/hash.c +0 -1
index 5534a735fa7e..60d482b7f872 100644
@@ -9,7 +9,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <hash.h>
 #include <linux/ctype.h>
cmd/help.c +0 -1
index 9f8393eefd81..56579e28d31d 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_help(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/history.c +0 -1
index b6bf4670b1ce..8972986ca9d1 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cli.h>
 
cmd/host.c +0 -1
index c33c2a9787eb..e03576b4d2de 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2012, Google Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <fs.h>
cmd/i2c.c +0 -1
index 80831561c671..7dac0a9fb6cb 100644
@@ -64,7 +64,6 @@
  * Adapted from cmd_mem.c which is copyright Wolfgang Denk ([email protected]).
  */
 
-#include <common.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
cmd/ide.c +0 -1
index ddc87d3a0bb9..036489fda979 100644
@@ -8,7 +8,6 @@
  * IDE support
  */
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <config.h>
cmd/ini.c +1 -1
index 35de2373e602..963990176916 100644
@@ -11,9 +11,9 @@
  * http://code.google.com/p/inih/
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
+#include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
cmd/io.c +1 -1
index 2de1111998fe..617373d3cb71 100644
@@ -7,9 +7,9 @@
  * IO space access commands.
  */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 /* Display values from last command */
cmd/iotrace.c +1 -1
index f28359e2875d..0a041ed8652a 100644
@@ -3,9 +3,9 @@
  * Copyright (c) 2014 Google, Inc
  */
 
-#include <common.h>
 #include <command.h>
 #include <iotrace.h>
+#include <vsprintf.h>
 
 static void do_print_stats(void)
 {
cmd/irq.c +0 -1
index 1d3e28cb3ce0..655aba576a8b 100644
@@ -3,7 +3,6 @@
  * Copyright 2008 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <irq_func.h>
cmd/itest.c +1 -1
index 74414cbdc4c6..b79512a505d6 100644
@@ -11,11 +11,11 @@
  * A few parts were lifted from bash 'test' command
  */
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 
 #include <asm/io.h>
 
cmd/jffs2.c +0 -1
index e00fcc202266..89d336f59585 100644
@@ -70,7 +70,6 @@
 /*
  * JFFS2/CRAMFS support
  */
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #if defined(CONFIG_CMD_FLASH)
cmd/kaslrseed.c +0 -1
index 9acb8e163863..e0d3c7fe7489 100644
@@ -6,7 +6,6 @@
  * Copyright (c) 2021, Chris Morgan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
cmd/led.c +0 -1
index 48a02baf509d..4256b3429c2f 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <led.h>
cmd/legacy-mtd-utils.c +0 -1
index 5903a90fe53b..1a5271000bf3 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <jffs2/jffs2.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
cmd/legacy_led.c +1 -2
index 5256255f052d..50de7e89d8f4 100644
@@ -9,10 +9,9 @@
  * Ulf Samuelsson <[email protected]>
  */
 
-#include <common.h>
-#include <config.h>
 #include <command.h>
 #include <status_led.h>
+#include <vsprintf.h>
 
 struct led_tbl_s {
 	char		*string;	/* String for use in the command */
cmd/license.c +0 -1
index 15411b5a92d5..161663ff29c6 100644
@@ -4,7 +4,6 @@
  * Author: Harald Welte <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <gzip.h>
 #include <malloc.h>
cmd/load.c +0 -1
index 540361b43f02..ace1c52f90ad 100644
@@ -7,7 +7,6 @@
 /*
  * Serial up- and download support
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <cpu_func.h>
cmd/log.c +0 -1
index c9a23e4ae0d3..519ec76f3b51 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <getopt.h>
cmd/lsblk.c +0 -1
index d214dafc3bee..7c00bfdc7a09 100644
@@ -4,7 +4,6 @@
  * Niel Fourie, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
cmd/lzmadec.c +1 -1
index 81924da46180..c40b96941b47 100644
@@ -9,10 +9,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 #include <lzma/LzmaTools.h>
cmd/mbr.c +1 -1
index ec99b662834e..7e1f92a13bb5 100644
@@ -8,11 +8,11 @@
  * based on the gpt command.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <malloc.h>
 #include <part.h>
+#include <vsprintf.h>
 
 /**
  * extract_val() - Extract a value from the key=value pair list
cmd/mdio.c +0 -1
index 3c74326161ef..c0a87087d315 100644
@@ -8,7 +8,6 @@
  * MDIO Commands
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <miiphy.h>
cmd/mem.c +1 -1
index 768057e4d3f6..4989d27f2ab4 100644
@@ -10,7 +10,6 @@
  * Copied from FADS ROM, Dan Malek ([email protected])
  */
 
-#include <common.h>
 #include <console.h>
 #include <bootretry.h>
 #include <cli.h>
@@ -24,6 +23,7 @@
 #include <log.h>
 #include <mapmem.h>
 #include <rand.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
cmd/meson/sm.c +1 -1
index de9a242e17f5..b69f8123ee2d 100644
@@ -9,11 +9,11 @@
  */
 
 #include <command.h>
-#include <common.h>
 #include <env.h>
 #include <asm/arch/sm.h>
 #include <stdlib.h>
 #include <display_options.h>
+#include <vsprintf.h>
 
 static int do_sm_serial(struct cmd_tbl *cmdtp, int flag, int argc,
 			char *const argv[])
cmd/mii.c +0 -1
index fab420ee29e2..ce3724896926 100644
@@ -8,7 +8,6 @@
  * MII Utilities
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <miiphy.h>
cmd/misc.c +0 -1
index ec32b41ed1e9..792d9723c759 100644
@@ -8,7 +8,6 @@
  * A command interface to access misc devices with MISC uclass driver APIs.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
cmd/mmc.c +1 -1
index 2d5430a53079..7244a90f4dce 100644
@@ -4,7 +4,6 @@
  * Kyle Harris, [email protected]
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <console.h>
@@ -14,6 +13,7 @@
 #include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
+#include <vsprintf.h>
 
 static int curr_device = -1;
 
cmd/mp.c +1 -1
index 1b4373f25873..b9b5e0162466 100644
@@ -3,9 +3,9 @@
  * Copyright 2008-2009 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <vsprintf.h>
 
 static int cpu_status_all(void)
 {
cmd/mtd.c +0 -1
index 9189f45cabd5..795aaa2b37da 100644
@@ -9,7 +9,6 @@
  */
 
 #include <command.h>
-#include <common.h>
 #include <console.h>
 #if CONFIG_IS_ENABLED(CMD_MTD_OTP)
 #include <hexdump.h>
cmd/mtdparts.c +0 -1
index b31db73ebfc9..f57d84dbb3ad 100644
@@ -70,7 +70,6 @@
  *
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
cmd/mux.c +0 -1
index 388fb0878a84..2f6c08b8b079 100644
@@ -6,7 +6,6 @@
  * Author: Pratyush Yadav <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
cmd/mvebu/bubt.c +0 -1
index 744b1c20aa83..e3f21dd0d815 100644
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>
cmd/mvebu/comphy_rx_training.c +0 -1
index 4ee8f54ea9c7..5653877cd4a2 100644
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <dm.h>
cmd/nand.c +0 -1
index fe834c4ac5c0..5a328e0acddf 100644
@@ -23,7 +23,6 @@
  * only
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <image.h>
 #include <asm/cache.h>
cmd/net.c +0 -1
index d407d8320a3d..b206ff58e681 100644
@@ -9,7 +9,6 @@
 /*
  * Boot support
  */
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <dm.h>
cmd/nvedit.c +1 -1
index e77338f81394..98a687bcabbd 100644
@@ -23,7 +23,7 @@
  * environment. After that, we use a hash table.
  */
 
-#include <common.h>
+#include <config.h>
 #include <cli.h>
 #include <command.h>
 #include <console.h>
cmd/nvedit_efi.c +0 -1
index 7a30b5cc8f87..64ae2ad2ce24 100644
@@ -6,7 +6,6 @@
  */
 
 #include <charset.h>
-#include <common.h>
 #include <command.h>
 #include <efi_loader.h>
 #include <efi_variable.h>
cmd/nvme.c +0 -1
index 09d5f438fb1a..f2c9acba5c32 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2017 Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
cmd/onenand.c +0 -1
index fad781583a31..6e808ce3fce4 100644
@@ -9,7 +9,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
 #include <linux/printk.h>
cmd/optee_rpmb.c +0 -1
index b3cafd924108..b155278ee2ad 100644
@@ -4,7 +4,6 @@
  */
 
 #include <command.h>
-#include <common.h>
 #include <env.h>
 #include <errno.h>
 #include <image.h>
cmd/osd.c +0 -1
index 210bc5d4c231..5671338d9e7b 100644
@@ -9,7 +9,6 @@
  * Dirk Eibach,  Guntermann & Drunck GmbH, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
cmd/panic.c +1 -1
index f13b3f094fab..7c0affa5eb50 100644
@@ -3,7 +3,7 @@
  * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
+#include <vsprintf.h>
 #include <command.h>
 
 static int do_panic(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/part.c +0 -1
index c75f85acd52d..d140a1eddb92 100644
@@ -15,7 +15,6 @@
  * Pavel Bartusek <[email protected]>
  */
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <env.h>
cmd/pcap.c +1 -1
index a0149203fad5..8d610966c13d 100644
@@ -4,8 +4,8 @@
  * Ramon Fried <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 #include <net.h>
 #include <net/pcap.h>
 
cmd/pci.c +0 -1
index d89e71c16a04..3c0aed50cae3 100644
@@ -12,7 +12,6 @@
  * PCI routines
  */
 
-#include <common.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
cmd/pci_mps.c +0 -1
index 98161da93a05..19e71db8cbd2 100644
@@ -6,7 +6,6 @@
  * PCI Express Maximum Packet Size (MPS) configuration
  */
 
-#include <common.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
cmd/pinmux.c +0 -1
index 105f01eaafff..01f3e4af6cec 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
cmd/pmc.c +0 -1
index 9a3ba2bffc50..1a3416fb2a96 100644
@@ -5,7 +5,6 @@
  * Copyright 2019 Google LLC
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <power/acpi_pmc.h>
cmd/pmic.c +0 -1
index c9e9730adf90..3ad1b8aa3756 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2015 Samsung Electronics
  * Przemyslaw Marczak <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
cmd/printf.c +1 -1
index 0c6887e0d6e9..a1727ac15a2d 100644
@@ -84,12 +84,12 @@
  * We try to be compatible.
  */
 
-#include <common.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <vsprintf.h>
 
 #define WANT_HEX_ESCAPES 0
 #define PRINT_CONVERSION_ERROR 1
cmd/pvblock.c +0 -1
index 1b604c37373c..3a83ac9cd92c 100644
@@ -6,7 +6,6 @@
  */
 
 #include <blk.h>
-#include <common.h>
 #include <command.h>
 
 /* Current I/O Device */
cmd/pxe.c +1 -1
index 21134eb7a304..ae02c28c0750 100644
@@ -4,12 +4,12 @@
  * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 #include <net.h>
 #include <net6.h>
 #include <malloc.h>
+#include <vsprintf.h>
 
 #include "pxe_utils.h"
 
cmd/qfw.c +0 -1
index 1b8c775ebf5a..1b108118658e 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2015 Miao Yan <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <errno.h>
cmd/read.c +1 -1
index 1218e7acfd0a..af54bd176547 100644
@@ -8,10 +8,10 @@
  * Software Foundation.
  */
 
-#include <common.h>
 #include <command.h>
 #include <mapmem.h>
 #include <part.h>
+#include <vsprintf.h>
 
 static int
 do_rw(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
cmd/reginfo.c +0 -1
index c8a04b1754eb..53b8bc41bfe5 100644
@@ -4,7 +4,6 @@
  * Subodh Nijsure, SkyStream Networks, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/ppc.h>
 
cmd/regulator.c +0 -1
index 635a9add5856..da298090bb76 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2015 Samsung Electronics
  * Przemyslaw Marczak <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <errno.h>
 #include <dm.h>
cmd/remoteproc.c +0 -1
index ea8724a187da..3c5b6a05b1af 100644
@@ -3,7 +3,6 @@
  * (C) Copyright 2015
  * Texas Instruments Incorporated - https://www.ti.com/
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
cmd/riscv/sbi.c +0 -1
index bd9d9c4765da..df9f212cd0dd 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2020, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/sbi.h>
 
cmd/rkmtd.c +0 -1
index 5b80427cb949..a870c1191108 100644
@@ -8,7 +8,6 @@
  * Copyright (C) 2023 Johan Jonker <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
cmd/rng.c +0 -1
index e5ab86811226..2fb7202303ac 100644
@@ -4,7 +4,6 @@
  *
  * Copyright (c) 2019, Heinrich Schuchardt <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <hexdump.h>
cmd/rockusb.c +0 -1
index 07088564a109..48497aa87641 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Eddie Cai <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <g_dnl.h>
cmd/rtc.c +0 -1
index a344cfa76b1d..a931fd9d54f0 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <dm.h>
cmd/sata.c +0 -1
index 9c9fe111d12f..8b923f9378b2 100644
@@ -9,7 +9,6 @@
  *		Dave Liu <[email protected]>
  */
 
-#include <common.h>
 #include <ahci.h>
 #include <blk.h>
 #include <dm.h>
cmd/sb.c +0 -1
index 0d55818e3c67..1aa5921f03e6 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <spl.h>
cmd/scp03.c +0 -1
index 2b8d5aecf349..9c749d19af81 100644
@@ -4,7 +4,6 @@
  *
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <scp03.h>
cmd/scsi.c +0 -1
index c501d7f456d7..c286bdc07260 100644
@@ -7,7 +7,6 @@
 /*
  * SCSI support.
  */
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <scsi.h>
cmd/seama.c +0 -1
index 3aafb43c48a0..3c8e81992340 100644
@@ -4,7 +4,6 @@
  * Support for the "SEAttle iMAge" SEAMA NAND image format
  */
 
-#include <common.h>
 #include <command.h>
 #include <nand.h>
 
cmd/setexpr.c +2 -1
index ab76824a32bb..e111b8ba98ad 100644
@@ -8,7 +8,6 @@
  * This file provides a shell like 'expr' function to return.
  */
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <ctype.h>
@@ -16,6 +15,8 @@
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <vsprintf.h>
+#include <linux/errno.h>
 #include <linux/sizes.h>
 #include "printf.h"
 
cmd/sf.c +1 -1
index e3866899f6c4..f43a2e08b318 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2008 Atmel Corporation
  */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <div64.h>
@@ -14,6 +13,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <spi.h>
+#include <time.h>
 #include <spi_flash.h>
 #include <asm/cache.h>
 #include <jffs2/jffs2.h>
cmd/sha1sum.c +0 -1
index bcc665a5a6c6..52aa26c78d2f 100644
@@ -7,7 +7,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <hash.h>
 #include <u-boot/sha1.h>
cmd/sleep.c +2 -1
index c741b4aa029b..7616fed75566 100644
@@ -4,9 +4,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <console.h>
+#include <time.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 static int do_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/smccc.c +1 -1
index fb80431ad1d9..3a4d885e37e1 100644
@@ -4,8 +4,8 @@
  * Michalis Pappas <[email protected]>
  */
 #include <asm/psci.h>
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 #include <linux/arm-smccc.h>
 #include <linux/compiler.h>
 #include <linux/psci.h>
cmd/sound.c +0 -1
index 0b7f9599716b..08bf74112f16 100644
@@ -4,7 +4,6 @@
  * Rajeshwari Shinde <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <fdtdec.h>
cmd/source.c +0 -1
index 0ba9736b1ab3..c9b5f8e400a6 100644
@@ -14,7 +14,6 @@
 
 /* #define DEBUG */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <image.h>
cmd/spi.c +0 -1
index f30018f33be8..ea30c854c218 100644
@@ -8,7 +8,6 @@
  * SPI Read/Write Utilities
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <errno.h>
cmd/spl.c +0 -1
index 8a2ded72be9f..d1f47c7316b4 100644
@@ -4,7 +4,6 @@
  * Corscience GmbH & Co. KG - Simon Schwarz <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <cmd_spl.h>
 #include <env.h>
cmd/stackprot_test.c +0 -1
index f3470288facc..e7ff4a061589 100644
@@ -3,7 +3,6 @@
  *  Copyright 2021 Broadcom
  */
 
-#include <common.h>
 #include <command.h>
 
 static int do_test_stackprot_fail(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/strings.c +1 -1
index bf348afce814..5bcb0f2b567c 100644
@@ -7,8 +7,8 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <command.h>
+#include <vsprintf.h>
 
 static char *start_addr, *last_addr;
 
cmd/sysboot.c +1 -1
index d14c570d96ab..0ea08fd7b535 100644
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <fs.h>
 #include <pxe_utils.h>
+#include <vsprintf.h>
 
 /**
  * struct sysboot_info - useful information for sysboot helpers
cmd/temperature.c +0 -1
index 420965de1436..41e422fc937d 100644
@@ -5,7 +5,6 @@
  * Written by Robert Marko <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <thermal.h>
cmd/terminal.c +0 -1
index 9e32a4191e1e..369a755e0f5f 100644
@@ -7,7 +7,6 @@
 /*
  * Boot support
  */
-#include <common.h>
 #include <command.h>
 #include <stdio_dev.h>
 #include <serial.h>
cmd/test.c +1 -1
index fa7c48fb9f10..b4c3eabf9f60 100644
@@ -4,10 +4,10 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <fs.h>
 #include <log.h>
+#include <vsprintf.h>
 
 #define OP_INVALID	0
 #define OP_NOT		1
cmd/thordown.c +0 -1
index 48e22b31d025..70061bf8d4cc 100644
@@ -6,7 +6,6 @@
  * All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <thor.h>
 #include <dfu.h>
cmd/ti/ddr3.c +0 -1
index bbd406fc66ec..70ce53d01e87 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/hardware.h>
 #include <asm/cache.h>
 #include <asm/emif.h>
-#include <common.h>
 #include <command.h>
 #include <asm/global_data.h>
 
cmd/ti/pd.c +0 -1
index a0492a5fdee3..305023af1e7d 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2020 Texas Instruments Incorporated, <www.ti.com>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <k3-dev.h>
cmd/time.c +0 -1
index db8c1892df4a..eee6084e9685 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <command.h>
 
 static void report_time(ulong cycles)
cmd/timer.c +1 -1
index 551be5dd54ee..04fcd84ac6a6 100644
@@ -4,8 +4,8 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
+#include <time.h>
 
 static int do_timer(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
cmd/tlv_eeprom.c +0 -1
index 57cfd355df1b..0aec75217709 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2014,2016 david_yang <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <i2c.h>
cmd/tpm-common.c +0 -1
index a7dc23d85d5d..1cd57f901b6d 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
cmd/tpm-v1.c +1 -1
index 1b1efcd204d2..6e019d1c7291 100644
@@ -3,10 +3,10 @@
  * Copyright (c) 2013 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <tpm-common.h>
 #include <tpm-v1.h>
cmd/tpm-v2.c +0 -1
index 7e479b9dfe36..99c540b26de9 100644
@@ -4,7 +4,6 @@
  * Author: Miquel Raynal <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>
cmd/tpm_test.c +1 -1
index c7fa6e775f55..9c8b1c74384a 100644
@@ -3,10 +3,10 @@
  * Copyright (c) 2015 Google, Inc
  */
 
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <log.h>
+#include <time.h>
 #include <tpm-v1.h>
 #include <linux/printk.h>
 #include "tpm-user-utils.h"
cmd/trace.c +1 -1
index 2e3ee1d3ba23..937e6a682add 100644
@@ -3,11 +3,11 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <mapmem.h>
 #include <trace.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 
 static int get_args(int argc, char *const argv[], char **buff,
cmd/tsi148.c +1 -1
index 0d849d9979e4..113b4e673304 100644
@@ -7,10 +7,10 @@
  * (C) Copyright 2003 Stefan Roese, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 
cmd/ubi.c +0 -1
index 0a6a80bdd109..8c1b5df05724 100644
@@ -11,7 +11,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <exports.h>
cmd/ubifs.c +1 -1
index 2a035bc7ae6f..8fd39032eccf 100644
@@ -11,11 +11,11 @@
 
 #undef DEBUG
 
-#include <common.h>
 #include <config.h>
 #include <command.h>
 #include <log.h>
 #include <ubifs_uboot.h>
+#include <vsprintf.h>
 
 static int ubifs_initialized;
 static int ubifs_mounted;
cmd/ufs.c +1 -1
index 536bd85b75d8..6e21fbb1685c 100644
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 Texas Instruments Incorporated - https://www.ti.com
  *
  */
-#include <common.h>
 #include <command.h>
 #include <ufs.h>
+#include <vsprintf.h>
 
 static int do_ufs(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
cmd/universe.c +1 -1
index fb3a32d4d5a7..d1a712829d01 100644
@@ -3,9 +3,9 @@
  * (C) Copyright 2003 Stefan Roese, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <vsprintf.h>
 #include <asm/io.h>
 #include <pci.h>
 
cmd/unlz4.c +1 -1
index 5f20838e899c..fc5200117adc 100644
@@ -4,9 +4,9 @@
  * FUJITSU COMPUTERTECHNOLOGIES LIMITED. All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
+#include <vsprintf.h>
 #include <u-boot/lz4.h>
 
 static int do_unlz4(struct cmd_tbl *cmdtp, int flag, int argc,
cmd/unzip.c +1 -1
index bc6cee060432..e7a3f9808b2c 100644
@@ -4,12 +4,12 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <gzip.h>
 #include <mapmem.h>
 #include <part.h>
+#include <vsprintf.h>
 
 static int do_unzip(struct cmd_tbl *cmdtp, int flag, int argc,
 		    char *const argv[])
cmd/usb.c +0 -1
index 23253f22231c..3a3764a5b862 100644
@@ -10,7 +10,6 @@
  * project.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <bootstage.h>
 #include <command.h>
cmd/usb_gadget_sdp.c +0 -1
index cbdda733533c..39259a3b0925 100644
@@ -6,7 +6,6 @@
  * Author: Stefan Agner <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <g_dnl.h>
 #include <sdp.h>
cmd/usb_mass_storage.c +0 -1
index 751701fe73af..47e8b70cd103 100644
@@ -6,7 +6,6 @@
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <console.h>
cmd/vbe.c +0 -1
index 0e84b0e97aa4..423d9e5f8f09 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bloblist.h>
 #include <bootmeth.h>
 #include <bootstd.h>
cmd/version.c +0 -1
index d99a44f19fb3..53db1a0b6bd1 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <version_string.h>
cmd/video.c +0 -1
index 942f81c16336..91bd6de14dc1 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <video.h>
cmd/virtio.c +0 -1
index 019e317e7558..a42a563ab727 100644
@@ -4,7 +4,6 @@
  * Copyright (C) 2018, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <dm.h>
cmd/w1.c +0 -1
index 3209e65f377f..e462e786a96e 100644
@@ -4,7 +4,6 @@
  * Microchip Technology, Inc.
  * Eugen Hristev <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <w1.h>
cmd/wdt.c +0 -1
index b9fdf7ad155f..c7a06cca181f 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2019 Michael Walle <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <wdt.h>
cmd/wol.c +1 -1
index f0d634322721..45d4ae3f719e 100644
@@ -7,9 +7,9 @@
 /*
  * Wake-on-LAN support
  */
-#include <common.h>
 #include <command.h>
 #include <net.h>
+#include <vsprintf.h>
 
 #if defined(CONFIG_CMD_WOL)
 void wol_set_timeout(ulong);
cmd/x86/cbsysinfo.c +0 -1
index 84822a3e3211..7ca2e13ae2f8 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <asm/cb_sysinfo.h>
 #include <command.h>
 #include <console.h>
cmd/x86/fsp.c +0 -1
index 82e4415b16eb..2620ab8ee025 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <asm/fsp/fsp_support.h>
 #include <asm/global_data.h>
cmd/x86/hob.c +0 -1
index 04d092dbe7ef..2dd30808bd10 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2014-2015, Bin Meng <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <efi.h>
 #include <uuid.h>
cmd/x86/mtrr.c +1 -1
index 6ad7a123a447..b2afb598c73e 100644
@@ -3,9 +3,9 @@
  * (C) Copyright 2014 Google, Inc
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
+#include <vsprintf.h>
 #include <asm/msr.h>
 #include <asm/mp.h>
 #include <asm/mtrr.h>
cmd/ximg.c +0 -1
index 0e7eead8d192..1467484df8d0 100644
@@ -11,7 +11,6 @@
 /*
  * Multi Image extract
  */
-#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
cmd/xxd.c +0 -1
index 446ac1915ef5..8ae05f910cb0 100644
@@ -4,7 +4,6 @@
  * Roger Knecht <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <fs.h>
cmd/yaffs2.c +0 -1
index 27fbd1be8f75..d0724d9bea8f 100644
@@ -13,7 +13,6 @@
  *  ...
  */
 
-#include <common.h>
 
 #include <config.h>
 #include <command.h>
cmd/zfs.c +0 -1
index 6ef1b56ab10b..2f831532c2e8 100644
@@ -8,7 +8,6 @@
  * made from existing GRUB Sources by Sun, GNU and others.
  */
 
-#include <common.h>
 #include <part.h>
 #include <config.h>
 #include <command.h>
cmd/zip.c +1 -1
index 08afd62b973d..2d2554288229 100644
@@ -4,10 +4,10 @@
  * Lei Wen <[email protected]>, Marvell Inc.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <gzip.h>
+#include <vsprintf.h>
 
 static int do_zip(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
include/android_ab.h +2 -0
index 1fee7582b90a..dbf20343da62 100644
@@ -6,6 +6,8 @@
 #ifndef __ANDROID_AB_H
 #define __ANDROID_AB_H
 
+#include <stdbool.h>
+
 struct blk_desc;
 struct disk_partition;
 
Signature · 1 line
2.34.1
author
#12 lore raw

PATCH 12/18 common: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "commmon/" files and when needed add missing include files directly.

---
 common/autoboot.c              | 3 ++-
 common/bloblist.c              | 1 -
 common/board_f.c               | 2 +-
 common/board_info.c            | 1 -
 common/board_r.c               | 2 +-
 common/bootstage.c             | 1 -
 common/bouncebuf.c             | 1 -
 common/cli.c                   | 1 -
 common/cli_getch.c             | 4 +++-
 common/cli_hush.c              | 1 -
 common/cli_readline.c          | 2 +-
 common/cli_simple.c            | 1 -
 common/command.c               | 3 ++-
 common/console.c               | 1 -
 common/cros_ec.c               | 1 -
 common/ddr_spd.c               | 2 +-
 common/dfu.c                   | 1 -
 common/dlmalloc.c              | 1 -
 common/edid.c                  | 1 -
 common/eeprom/eeprom_field.c   | 3 ++-
 common/eeprom/eeprom_layout.c  | 2 +-
 common/event.c                 | 2 +-
 common/exports.c               | 1 -
 common/flash.c                 | 2 +-
 common/hash.c                  | 1 -
 common/hwconfig.c              | 1 -
 common/init/board_init.c       | 2 +-
 common/init/handoff.c          | 2 +-
 common/iomux.c                 | 1 -
 common/iotrace.c               | 1 -
 common/kallsyms.c              | 1 -
 common/kgdb.c                  | 1 -
 common/kgdb_stubs.c            | 1 -
 common/log.c                   | 1 -
 common/log_console.c           | 1 -
 common/log_syslog.c            | 1 -
 common/main.c                  | 1 -
 common/malloc_simple.c         | 1 -
 common/memsize.c               | 2 +-
 common/menu.c                  | 1 -
 common/miiphyutil.c            | 1 -
 common/s_record.c              | 1 -
 common/scp03.c                 | 3 ++-
 common/spl/spl.c               | 2 +-
 common/spl/spl_atf.c           | 1 -
 common/spl/spl_blk_fs.c        | 1 -
 common/spl/spl_bootrom.c       | 1 -
 common/spl/spl_dfu.c           | 1 -
 common/spl/spl_ext.c           | 1 -
 common/spl/spl_fat.c           | 1 -
 common/spl/spl_fit.c           | 1 -
 common/spl/spl_imx_container.c | 1 -
 common/spl/spl_legacy.c        | 1 -
 common/spl/spl_mmc.c           | 1 -
 common/spl/spl_nand.c          | 1 -
 common/spl/spl_net.c           | 1 -
 common/spl/spl_nor.c           | 2 +-
 common/spl/spl_nvme.c          | 1 -
 common/spl/spl_onenand.c       | 1 -
 common/spl/spl_opensbi.c       | 1 -
 common/spl/spl_ram.c           | 1 -
 common/spl/spl_sata.c          | 1 -
 common/spl/spl_sdp.c           | 1 -
 common/spl/spl_semihosting.c   | 1 -
 common/spl/spl_spi.c           | 2 +-
 common/spl/spl_ubi.c           | 1 -
 common/spl/spl_usb.c           | 1 -
 common/spl/spl_xip.c           | 2 +-
 common/spl/spl_ymodem.c        | 1 -
 common/splash.c                | 3 ++-
 common/splash_source.c         | 1 -
 common/stackprot.c             | 1 -
 common/stdio.c                 | 1 -
 common/update.c                | 1 -
 common/usb.c                   | 1 -
 common/usb_hub.c               | 2 +-
 common/usb_kbd.c               | 2 +-
 common/usb_onboard_hub.c       | 1 -
 common/usb_storage.c           | 1 -
 common/xyzModem.c              | 3 ++-
 include/atf_common.h           | 2 ++
 include/autoboot.h             | 1 +
 include/bmp_layout.h           | 2 ++
 include/ddr_spd.h              | 2 ++
 include/flash.h                | 2 ++
 include/gzip.h                 | 2 ++
 include/handoff.h              | 1 +
 include/nand.h                 | 2 --
 include/s_record.h             | 2 ++
 89 files changed, 45 insertions(+), 82 deletions(-)
common/autoboot.c +2 -1
index 6f0aeae6bf33..898a57bc92bd 100644
@@ -4,13 +4,14 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <autoboot.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
 #include <console.h>
 #include <env.h>
+#include <errno.h>
 #include <fdtdec.h>
 #include <hash.h>
 #include <log.h>
common/bloblist.c +0 -1
index ad06d7a1795d..11d6422b695a 100644
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY	LOGC_BLOBLIST
 
-#include <common.h>
 #include <bloblist.h>
 #include <display_options.h>
 #include <log.h>
common/board_f.c +1 -1
index 039d6d712d05..212ffb3090b2 100644
@@ -9,7 +9,7 @@
  * Marius Groeger <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <bloblist.h>
 #include <bootstage.h>
 #include <clock_legacy.h>
common/board_info.c +0 -1
index f4c385add90c..33c260b404e8 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <dm.h>
 #include <init.h>
 #include <sysinfo.h>
common/board_r.c +1 -1
index da0b80f24ff0..c823cd262f16 100644
@@ -9,7 +9,7 @@
  * Marius Groeger <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <api.h>
 #include <bootstage.h>
 #include <cpu_func.h>
common/bootstage.c +0 -1
index 0e6d80718fd5..fb6befcbc4a8 100644
@@ -11,7 +11,6 @@
 
 #define LOG_CATEGORY	LOGC_BOOT
 
-#include <common.h>
 #include <bootstage.h>
 #include <hang.h>
 #include <log.h>
common/bouncebuf.c +0 -1
index 934b83f7ec3f..b2f87e4d939b 100644
@@ -5,7 +5,6 @@
  * Copyright (C) 2012 Marek Vasut <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <log.h>
 #include <malloc.h>
common/cli.c +0 -1
index 1c33daf1149a..4694a35cd0e0 100644
@@ -10,7 +10,6 @@
 
 #define pr_fmt(fmt) "cli: %s: " fmt, __func__
 
-#include <common.h>
 #include <ansi.h>
 #include <bootstage.h>
 #include <cli.h>
common/cli_getch.c +3 -1
index 0ee790877748..a5ed6eb6fcfa 100644
@@ -6,8 +6,10 @@
  * Copyright 2022 Google LLC
  */
 
-#include <common.h>
 #include <cli.h>
+#include <stdio.h>
+#include <string.h>
+#include <linux/errno.h>
 
 /**
  * enum cli_esc_state_t - indicates what to do with an escape character
common/cli_hush.c +0 -1
index 9cda97f30e3c..96a98209b9d2 100644
@@ -75,7 +75,6 @@
 
 #define __U_BOOT__
 #ifdef __U_BOOT__
-#include <common.h>         /* readline */
 #include <env.h>
 #include <malloc.h>         /* malloc, free, realloc*/
 #include <linux/ctype.h>    /* isalpha, isdigit */
common/cli_readline.c +1 -1
index cf4339d0e509..4cb82b40149a 100644
@@ -8,7 +8,6 @@
  * JinHua Luo, GuangDong Linux Center, <[email protected]>
  */
 
-#include <common.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
@@ -16,6 +15,7 @@
 #include <malloc.h>
 #include <time.h>
 #include <watchdog.h>
+#include <linux/errno.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
common/cli_simple.c +0 -1
index f89ba92d1b05..266c444334eb 100644
@@ -8,7 +8,6 @@
  * JinHua Luo, GuangDong Linux Center, <[email protected]>
  */
 
-#include <common.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <command.h>
common/command.c +2 -1
index af8ffdba8f8c..3f691399cbee 100644
@@ -8,7 +8,7 @@
  *  Command Processor Table
  */
 
-#include <common.h>
+#include <config.h>
 #include <compiler.h>
 #include <command.h>
 #include <console.h>
@@ -16,6 +16,7 @@
 #include <image.h>
 #include <log.h>
 #include <mapmem.h>
+#include <time.h>
 #include <asm/global_data.h>
 #include <linux/ctype.h>
 
common/console.c +0 -1
index aa3053bc4414..63f78004fdbc 100644
@@ -4,7 +4,6 @@
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), [email protected]
  */
 
-#include <common.h>
 #include <console.h>
 #include <debug_uart.h>
 #include <display_options.h>
common/cros_ec.c +0 -1
index 249d1f19411e..9ccc8fa16cdb 100644
@@ -8,7 +8,6 @@
  * Software Foundation.
  */
 
-#include <common.h>
 #include <cros_ec.h>
 #include <dm.h>
 #include <errno.h>
common/ddr_spd.c +1 -1
index 58dc9b3781b7..2f6eb99bf0cf 100644
@@ -3,8 +3,8 @@
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <ddr_spd.h>
+#include <stdio.h>
 
 /* used for ddr1 and ddr2 spd */
 static int
common/dfu.c +0 -1
index 0d154e8d4c48..1af8194139c3 100644
@@ -10,7 +10,6 @@
  *	    Lukasz Majewski <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <watchdog.h>
common/dlmalloc.c +0 -1
index a0616217d495..9549c59f3585 100644
@@ -12,7 +12,6 @@
 #define DEBUG
 #endif
 
-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 
common/edid.c +0 -1
index 556c4e3434b6..865ba9daa78a 100644
@@ -9,7 +9,6 @@
  * Copyright (C) Nalin Dahyabhai <[email protected]>
  */
 
-#include <common.h>
 #include <edid.h>
 #include <errno.h>
 #include <fdtdec.h>
common/eeprom/eeprom_field.c +2 -1
index f56eebe679f7..3bacb1ae7eb7 100644
@@ -6,7 +6,8 @@
  *	    Igor Grinberg <[email protected]>
  */
 
-#include <common.h>
+#include <stdio.h>
+#include <vsprintf.h>
 #include <linux/string.h>
 #include <eeprom_field.h>
 
common/eeprom/eeprom_layout.c +1 -1
index 5a9be1da061f..1a425c1754d4 100644
@@ -6,8 +6,8 @@
  *	    Igor Grinberg <[email protected]>
  */
 
-#include <common.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
 #include <eeprom_layout.h>
 #include <eeprom_field.h>
 
common/event.c +1 -1
index 16c2ba6cc921..dda569d44785 100644
@@ -9,13 +9,13 @@
 
 #define LOG_CATEGORY	LOGC_EVENT
 
-#include <common.h>
 #include <event.h>
 #include <event_internal.h>
 #include <log.h>
 #include <linker_lists.h>
 #include <malloc.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/list.h>
 #include <relocate.h>
 
common/exports.c +0 -1
index 20d8b759bc25..48b084c38613 100644
@@ -1,4 +1,3 @@
-#include <common.h>
 #include <command.h>
 #include <exports.h>
 #include <malloc.h>
common/flash.c +1 -1
index 848f44e59dfd..24ddc8bee724 100644
@@ -6,10 +6,10 @@
 
 /* #define DEBUG */
 
-#include <common.h>
 #include <flash.h>
 #include <log.h>
 #include <uuid.h>
+#include <linux/string.h>
 
 #include <mtd/cfi_flash.h>
 
common/hash.c +0 -1
index 3d6b84de4738..ac63803fed95 100644
@@ -10,7 +10,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
common/hwconfig.c +0 -1
index cac0b6348f46..afaa6cb37ab4 100644
@@ -10,7 +10,6 @@
 
 #ifndef HWCONFIG_TEST
 #include <config.h>
-#include <common.h>
 #include <env.h>
 #include <exports.h>
 #include <hwconfig.h>
common/init/board_init.c +1 -1
index ed2365daa35e..a06ec1caa2ca 100644
@@ -6,7 +6,7 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <bootstage.h>
 #include <init.h>
 #include <asm/global_data.h>
common/init/handoff.c +1 -1
index d0be1bb17a2c..687513bda353 100644
@@ -5,9 +5,9 @@
  * Copyright 2018 Google, Inc
  */
 
-#include <common.h>
 #include <handoff.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
common/iomux.c +0 -1
index c428f7110a7a..1224c15eb718 100644
@@ -4,7 +4,6 @@
  * Gary Jennejohn, DENX Software Engineering GmbH, [email protected].
  */
 
-#include <common.h>
 #include <console.h>
 #include <serial.h>
 #include <malloc.h>
common/iotrace.c +0 -1
index 63d0cca3a004..a0a5613bd9b3 100644
@@ -5,7 +5,6 @@
 
 #define IOTRACE_IMPL
 
-#include <common.h>
 #include <mapmem.h>
 #include <time.h>
 #include <asm/global_data.h>
common/kallsyms.c +0 -1
index 13344e634b99..49b3897078ae 100644
@@ -5,7 +5,6 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <common.h>
 
 /* We need the weak marking as this symbol is provided specially */
 extern const char system_map[] __attribute__((weak));
common/kgdb.c +0 -1
index 29b09fcfe56b..01a09f176286 100644
@@ -87,7 +87,6 @@
  *
  ****************************************************************************/
 
-#include <common.h>
 #include <asm/ptrace.h>
 
 #include <kgdb.h>
common/kgdb_stubs.c +0 -1
index 66aed7cea1c7..256d88697d7e 100644
@@ -7,7 +7,6 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <kgdb.h>
 #include <serial.h>
common/log.c +0 -1
index 42d35f04b689..dfee250b158a 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <display_options.h>
 #include <log.h>
 #include <malloc.h>
common/log_console.c +0 -1
index bb091ce21a4a..c27101b8fe22 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <asm/global_data.h>
 
common/log_syslog.c +0 -1
index 53c4def5d1c0..d01bb749c22d 100644
@@ -5,7 +5,6 @@
  * Copyright (c) 2020, Heinrich Schuchardt <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <net.h>
 #include <asm/global_data.h>
common/main.c +0 -1
index 82d3aafa53c9..b0b6e74f5d3d 100644
@@ -6,7 +6,6 @@
 
 /* #define	DEBUG	*/
 
-#include <common.h>
 #include <autoboot.h>
 #include <button.h>
 #include <bootstage.h>
common/malloc_simple.c +0 -1
index 0a004d40e1ec..4e6d7952b3ca 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY LOGC_ALLOC
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
common/memsize.c +1 -1
index d646df8b04cb..86109579c954 100644
@@ -4,7 +4,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <init.h>
 #include <asm/global_data.h>
 #include <cpu_func.h>
common/menu.c +0 -1
index b55cf7b99967..e48424995b64 100644
@@ -5,7 +5,6 @@
  */
 
 #include <ansi.h>
-#include <common.h>
 #include <cli.h>
 #include <malloc.h>
 #include <errno.h>
common/miiphyutil.c +0 -1
index 194c84e7e89d..9b8744e5d8bf 100644
@@ -9,7 +9,6 @@
  * channel.
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
common/s_record.c +0 -1
index 2b7651fcffca..486dd93abd41 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <s_record.h>
 
 static int hex1_bin (char  c);
common/scp03.c +2 -1
index 09ef7b5ba3dc..54b1bd54b604 100644
@@ -4,10 +4,11 @@
  *
  */
 
-#include <common.h>
 #include <scp03.h>
 #include <tee.h>
 #include <tee/optee_ta_scp03.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 
 static int scp03_enable(bool provision)
 {
common/spl/spl.c +1 -1
index e06bc75d36b2..4e92771ecaae 100644
@@ -6,7 +6,7 @@
  * Aneesh V <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <bloblist.h>
 #include <binman_sym.h>
 #include <bootstage.h>
common/spl/spl_atf.c +0 -1
index 3bdd013a35fe..0b1c981a105d 100644
@@ -9,7 +9,6 @@
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmbH
  */
 
-#include <common.h>
 #include <atf_common.h>
 #include <cpu_func.h>
 #include <errno.h>
common/spl/spl_blk_fs.c +0 -1
index 04eac6f306bd..bc551c5c074c 100644
@@ -5,7 +5,6 @@
  *
  */
 
-#include <common.h>
 #include <spl.h>
 #include <spl_load.h>
 #include <image.h>
common/spl/spl_bootrom.c +0 -1
index 0eefd39a5198..e172a2d7b83c 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2017 Theobroma Systems Design und Consulting GmH
  */
 
-#include <common.h>
 #include <spl.h>
 
 __weak int board_return_to_bootrom(struct spl_image_info *spl_image,
common/spl/spl_dfu.c +0 -1
index 8a779da8fa1e..e9f381c392cd 100644
@@ -5,7 +5,6 @@
  *
  * Ravi B <[email protected]>
  */
-#include <common.h>
 #include <env.h>
 #include <spl.h>
 #include <linux/compiler.h>
common/spl/spl_ext.c +0 -1
index 2be6f04b02c5..2399e1d806d4 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0+
 
-#include <common.h>
 #include <env.h>
 #include <part.h>
 #include <spl.h>
common/spl/spl_fat.c +0 -1
index a52f9e178e66..2e320ba7c018 100644
@@ -8,7 +8,6 @@
  * FAT Image Functions copied from spl_mmc.c
  */
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <spl.h>
common/spl/spl_fit.c +0 -1
index e5195d460c49..988125be008d 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <errno.h>
 #include <fpga.h>
 #include <gzip.h>
common/spl/spl_imx_container.c +0 -1
index b4ea9241d685..2c31777fcd3a 100644
@@ -4,7 +4,6 @@
  */
 
 #define LOG_CATEGORY LOGC_ARCH
-#include <common.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <imx_container.h>
common/spl/spl_legacy.c +0 -1
index 08687ca8f6c4..a77893455f25 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <log.h>
 #include <malloc.h>
common/spl/spl_mmc.c +0 -1
index 3d032bb27ce3..f4481b90463a 100644
@@ -5,7 +5,6 @@
  *
  * Aneesh V <[email protected]>
  */
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <part.h>
common/spl/spl_nand.c +0 -1
index 3b0a15242389..5631fa6d5635 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <[email protected]>
  */
-#include <common.h>
 #include <config.h>
 #include <fdt_support.h>
 #include <image.h>
common/spl/spl_net.c +0 -1
index 898f9df705a2..be7278bb9334 100644
@@ -6,7 +6,6 @@
  * (C) Copyright 2012
  * Ilya Yanok <[email protected]>
  */
-#include <common.h>
 #include <env.h>
 #include <errno.h>
 #include <image.h>
common/spl/spl_nor.c +1 -1
index 70745114efed..ed76b5e1293b 100644
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Stefan Roese <[email protected]>
  */
 
-#include <common.h>
+#include <config.h>
 #include <image.h>
 #include <imx_container.h>
 #include <log.h>
common/spl/spl_nvme.c +0 -1
index c8774d67ecf1..0e15a3c7545a 100644
@@ -5,7 +5,6 @@
  *
  */
 
-#include <common.h>
 #include <spl.h>
 #include <nvme.h>
 
common/spl/spl_onenand.c +0 -1
index 53a8c6de89eb..f6f65286c216 100644
@@ -7,7 +7,6 @@
  * Copyright (C) 2011
  * Corscience GmbH & Co. KG - Simon Schwarz <[email protected]>
  */
-#include <common.h>
 #include <config.h>
 #include <image.h>
 #include <log.h>
common/spl/spl_opensbi.c +0 -1
index ec62aab929b9..5a26d7c31a43 100644
@@ -5,7 +5,6 @@
  *
  * Based on common/spl/spl_atf.c
  */
-#include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
 #include <hang.h>
common/spl/spl_ram.c +0 -1
index 8aeda237be13..5a23841f6981 100644
@@ -9,7 +9,6 @@
  * Michal Simek <[email protected]>
  * Stefan Agner <[email protected]>
  */
-#include <common.h>
 #include <binman_sym.h>
 #include <image.h>
 #include <log.h>
common/spl/spl_sata.c +0 -1
index 32746ce9f3cf..18acc40e46fc 100644
@@ -8,7 +8,6 @@
  * Derived work from spl_usb.c
  */
 
-#include <common.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <sata.h>
common/spl/spl_sdp.c +0 -1
index 9143c27bbf1d..9ca80bd534f8 100644
@@ -4,7 +4,6 @@
  * Author: Stefan Agner <[email protected]>
  */
 
-#include <common.h>
 #include <log.h>
 #include <spl.h>
 #include <usb.h>
common/spl/spl_semihosting.c +0 -1
index 941fa911040e..2047248f39b0 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2022 Sean Anderson <[email protected]>
  */
 
-#include <common.h>
 #include <image.h>
 #include <log.h>
 #include <semihosting.h>
common/spl/spl_spi.c +1 -1
index 89de73c726cd..8ab4803f7c4b 100644
@@ -8,7 +8,7 @@
  * Heiko Schocher, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <image.h>
 #include <imx_container.h>
 #include <log.h>
common/spl/spl_ubi.c +0 -1
index d7ab9efd1108..a8d3f43b4528 100644
@@ -4,7 +4,6 @@
  * Ladislav Michl <[email protected]>
  */
 
-#include <common.h>
 #include <config.h>
 #include <image.h>
 #include <nand.h>
common/spl/spl_usb.c +0 -1
index 479e2dc1826e..31fc4b57d486 100644
@@ -8,7 +8,6 @@
  * Derived work from spl_mmc.c
  */
 
-#include <common.h>
 #include <log.h>
 #include <spl.h>
 #include <asm/u-boot.h>
common/spl/spl_xip.c +1 -1
index 959915ffa610..1465c3e46b92 100644
@@ -4,7 +4,7 @@
  * Author(s): Vikas Manocha, <[email protected]> for STMicroelectronics.
  */
 
-#include <common.h>
+#include <config.h>
 #include <image.h>
 #include <log.h>
 #include <spl.h>
common/spl/spl_ymodem.c +0 -1
index 1faaa2c938d4..fd48f80f75e3 100644
@@ -8,7 +8,6 @@
  *
  * Matt Porter <[email protected]>
  */
-#include <common.h>
 #include <gzip.h>
 #include <image.h>
 #include <log.h>
common/splash.c +2 -1
index 6820db683bd6..c5591293634a 100644
@@ -20,11 +20,12 @@
  *
  */
 
-#include <common.h>
 #include <display_options.h>
 #include <env.h>
 #include <splash.h>
 #include <video.h>
+#include <vsprintf.h>
+#include <linux/kernel.h>
 
 static struct splash_location default_splash_locations[] = {
 	{
common/splash_source.c +0 -1
index 2ce0768833d9..5b2711604495 100644
@@ -5,7 +5,6 @@
  * Authors: Igor Grinberg <[email protected]>
  */
 
-#include <common.h>
 #include <bmp_layout.h>
 #include <command.h>
 #include <env.h>
common/stackprot.c +0 -1
index 6495951a773c..4e3297b7d006 100644
@@ -3,7 +3,6 @@
  *  Copyright 2021 Broadcom
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;
common/stdio.c +0 -1
index e3354f092dc9..a61220ce4b9c 100644
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <common.h>
 #include <dm.h>
 #include <errno.h>
 #include <log.h>
common/update.c +0 -1
index ec302ca68fb0..eb0b60a2ce48 100644
@@ -6,7 +6,6 @@
  *             Bartlomiej Sieka <[email protected]>
  */
 
-#include <common.h>
 #include <cpu_func.h>
 #include <image.h>
 #include <linux/printk.h>
common/usb.c +0 -1
index 99e6b857c74c..84b10f5c7d8c 100644
@@ -25,7 +25,6 @@
  *
  * For each transfer (except "Interrupt") we wait for completion.
  */
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <dm/device_compat.h>
common/usb_hub.c +1 -1
index 2e054eb93537..807f490bb609 100644
@@ -21,7 +21,6 @@
  * Probes device for being a hub and configurate it
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
@@ -29,6 +28,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <memalign.h>
+#include <time.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
common/usb_kbd.c +1 -1
index 820f591fc5bb..f3b4a3c94e6d 100644
@@ -6,7 +6,6 @@
  * Part of this source has been derived from the Linux USB
  * project.
  */
-#include <common.h>
 #include <console.h>
 #include <dm.h>
 #include <env.h>
@@ -15,6 +14,7 @@
 #include <malloc.h>
 #include <memalign.h>
 #include <stdio_dev.h>
+#include <time.h>
 #include <watchdog.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
common/usb_onboard_hub.c +0 -1
index 89e18a2ddad6..68a04ac0412b 100644
@@ -7,7 +7,6 @@
  * Mostly inspired by Linux kernel v6.1 onboard_usb_hub driver
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <power/regulator.h>
common/usb_storage.c +0 -1
index 774d5bdf54b4..a79ed2e23a44 100644
@@ -32,7 +32,6 @@
  */
 
 
-#include <common.h>
 #include <blk.h>
 #include <bootdev.h>
 #include <command.h>
common/xyzModem.c +2 -1
index fb319f711907..9feb240de281 100644
@@ -21,12 +21,13 @@
  *
  *==========================================================================
  */
-#include <common.h>
 #include <xyzModem.h>
 #include <stdarg.h>
+#include <time.h>
 #include <u-boot/crc.h>
 #include <watchdog.h>
 #include <env.h>
+#include <vsprintf.h>
 
 /* Assumption - run xyzModem protocol over the console port */
 
include/atf_common.h +2 -0
index d69892fac6cb..5ae450902523 100644
@@ -74,6 +74,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/types.h>
+
 /*******************************************************************************
  * Structure used for telling the next BL how much of a particular type of
  * memory is available for its use and how much is already used.
include/autoboot.h +1 -0
index eb204995d079..c68bd79f8dca 100644
@@ -12,6 +12,7 @@
 #define __AUTOBOOT_H
 
 #include <stdbool.h>
+#include <stddef.h>
 
 #ifdef CONFIG_SANDBOX
 
include/bmp_layout.h +2 -0
index a5c9498dc9fb..eabbd25a3309 100644
@@ -10,6 +10,8 @@
 #ifndef _BMP_H_
 #define _BMP_H_
 
+#include <linux/compiler.h>
+
 struct __packed bmp_color_table_entry {
 	__u8	blue;
 	__u8	green;
include/ddr_spd.h +2 -0
index fe163da43e56..c4d199fd7e14 100644
@@ -6,6 +6,8 @@
 #ifndef _DDR_SPD_H_
 #define _DDR_SPD_H_
 
+#include <linux/types.h>
+
 /*
  * Format from "JEDEC Standard No. 21-C,
  * Appendix D: Rev 1.0: SPD's for DDR SDRAM
include/flash.h +2 -0
index 3710a2731b76..0f7369774117 100644
@@ -7,6 +7,8 @@
 #ifndef _FLASH_H_
 #define _FLASH_H_
 
+#include <linux/types.h>
+
 /*-----------------------------------------------------------------------
  * FLASH Info: contains chip specific data, per FLASH bank
  */
include/gzip.h +2 -0
index e578b283edcd..5e0d0ec07fbc 100644
@@ -7,6 +7,8 @@
 #ifndef __GZIP_H
 #define __GZIP_H
 
+#include <linux/types.h>
+
 struct blk_desc;
 
 /**
include/handoff.h +1 -0
index 0104b834f2c4..c0ae7b19a759 100644
@@ -10,6 +10,7 @@
 
 #if CONFIG_IS_ENABLED(HANDOFF)
 
+#include <linux/types.h>
 #include <asm/handoff.h>
 
 /**
include/nand.h +0 -2
index 220ffa202ef9..cdba7384ad14 100644
@@ -8,8 +8,6 @@
 #ifndef _NAND_H_
 #define _NAND_H_
 
-#include <config.h>
-
 extern void nand_init(void);
 void nand_reinit(void);
 unsigned long nand_size(void);
include/s_record.h +2 -0
index 3ece695941d3..aab09d9c3c81 100644
@@ -4,6 +4,8 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
+#include <linux/types.h>
+
 /*--------------------------------------------------------------------------
  *
  * Motorola S-Record Format:
Signature · 1 line
2.34.1
author
#13 lore raw

PATCH 13/18 part: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "part/" files and when needed add missing include files directly.

---
 disk/disk-uclass.c | 1 -
 disk/part.c        | 1 -
 disk/part_amiga.c  | 2 +-
 disk/part_dos.c    | 2 +-
 disk/part_efi.c    | 1 -
 disk/part_iso.c    | 1 -
 disk/part_mac.c    | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)
disk/disk-uclass.c +0 -1
index efe4bf1f9490..ee3cc4407d76 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_PARTITION
 
-#include <common.h>
 #include <blk.h>
 #include <dm.h>
 #include <log.h>
disk/part.c +0 -1
index 2bee6695828a..bc932526f906 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <env.h>
disk/part_amiga.c +1 -1
index 65e30fea558d..9b0f2fe74985 100644
@@ -4,12 +4,12 @@
  * Hans-Joerg Frieden, Hyperion Entertainment
  * [email protected]
  */
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <ide.h>
 #include "part_amiga.h"
 #include <part.h>
+#include <vsprintf.h>
 
 #undef AMIGA_DEBUG
 
disk/part_dos.c +1 -1
index 567ead7511de..e6b5295e0ec4 100644
@@ -13,11 +13,11 @@
  * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <ide.h>
 #include <memalign.h>
+#include <vsprintf.h>
 #include <asm/unaligned.h>
 #include <linux/compiler.h>
 #include "part_dos.h"
disk/part_efi.c +0 -1
index 4ce9243ef25c..b1a03bd165e0 100644
@@ -12,7 +12,6 @@
 
 #define LOG_CATEGORY LOGC_FS
 
-#include <common.h>
 #include <blk.h>
 #include <log.h>
 #include <part.h>
disk/part_iso.c +0 -1
index 6ac6d95be921..6e05b2feffba 100644
@@ -4,7 +4,6 @@
  * Denis Peter, MPL AG Switzerland, [email protected].
  */
 
-#include <common.h>
 #include <blk.h>
 #include <command.h>
 #include <part.h>
disk/part_mac.c +0 -1
index db5e203be592..81a65823be99 100644
@@ -12,7 +12,6 @@
  * http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <memalign.h>
Signature · 1 line
2.34.1
author
#14 lore raw

PATCH 14/18 boot: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "boot/" files and when needed add missing include files directly.

---
 boot/android_ab.c        | 1 -
 boot/boot_fit.c          | 1 -
 boot/bootdev-uclass.c    | 1 -
 boot/bootflow.c          | 1 -
 boot/bootflow_menu.c     | 1 -
 boot/bootm.c             | 1 -
 boot/bootm_os.c          | 1 -
 boot/bootmeth-uclass.c   | 1 -
 boot/bootmeth_cros.c     | 1 -
 boot/bootmeth_efi.c      | 1 -
 boot/bootmeth_efi_mgr.c  | 1 -
 boot/bootmeth_extlinux.c | 1 -
 boot/bootmeth_pxe.c      | 1 -
 boot/bootmeth_qfw.c      | 1 -
 boot/bootmeth_sandbox.c  | 1 -
 boot/bootmeth_script.c   | 1 -
 boot/bootretry.c         | 3 ++-
 boot/bootstd-uclass.c    | 1 -
 boot/cedit.c             | 1 -
 boot/common_fit.c        | 1 -
 boot/expo.c              | 1 -
 boot/expo_build.c        | 1 -
 boot/fdt_simplefb.c      | 1 -
 boot/fdt_support.c       | 1 -
 boot/image-android-dt.c  | 1 -
 boot/image-android.c     | 1 -
 boot/image-board.c       | 2 +-
 boot/image-cipher.c      | 1 -
 boot/image-fdt.c         | 1 -
 boot/image-fit-sig.c     | 1 -
 boot/image-fit.c         | 1 -
 boot/image-pre-load.c    | 1 -
 boot/image-sig.c         | 1 -
 boot/image.c             | 1 -
 boot/pxe_utils.c         | 1 -
 boot/scene.c             | 1 -
 boot/scene_menu.c        | 1 -
 boot/scene_textline.c    | 4 +++-
 boot/vbe.c               | 1 -
 boot/vbe_request.c       | 1 -
 boot/vbe_simple.c        | 1 -
 boot/vbe_simple_fw.c     | 1 -
 boot/vbe_simple_os.c     | 1 -
 43 files changed, 6 insertions(+), 43 deletions(-)
boot/android_ab.c +0 -1
index 1e5aa81b7503..143f373aae96 100644
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2017 The Android Open Source Project
  */
-#include <common.h>
 #include <android_ab.h>
 #include <android_bootloader_message.h>
 #include <blk.h>
boot/boot_fit.c +0 -1
index 9d3941265636..4dcaf95c6ae3 100644
@@ -7,7 +7,6 @@
  */
 
 #include <boot_fit.h>
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>
boot/bootdev-uclass.c +0 -1
index 46815ea2fdbf..7c7bba088c99 100644
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <dm.h>
 #include <bootdev.h>
 #include <bootflow.h>
boot/bootflow.c +0 -1
index 68bf99329ab0..9aa3179c3881 100644
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootflow_menu.c +0 -1
index 16f9cd8f8ca5..143ef8413326 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootflow.h>
 #include <bootstd.h>
 #include <cli.h>
boot/bootm.c +0 -1
index 032f5a4a1605..6fa8edab021e 100644
@@ -5,7 +5,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <cli.h>
boot/bootm_os.c +0 -1
index ccde72d22c17..15297ddb530b 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <bootm.h>
 #include <bootstage.h>
 #include <cpu_func.h>
boot/bootmeth-uclass.c +0 -1
index 1d157d54dbdd..c0abadef97ca 100644
@@ -6,7 +6,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_cros.c +0 -1
index f015f2e1c75f..645b8bed1020 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootdev.h>
 #include <bootflow.h>
boot/bootmeth_efi.c +0 -1
index aebc5207fc01..c7035c0d0c4e 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_efi_mgr.c +0 -1
index b7d429f2c3da..23ae1e610ac7 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_extlinux.c +0 -1
index ae0ad1d53e3f..9b55686948f7 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_pxe.c +0 -1
index 70f693aa239b..03d2589c264f 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_qfw.c +0 -1
index 8ebbc3ebcd58..dfaa944594e3 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <command.h>
 #include <bootdev.h>
 #include <bootflow.h>
boot/bootmeth_sandbox.c +0 -1
index aabc57e635a8..0bc8f688e30b 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootmeth_script.c +0 -1
index 06340e43d2d7..0e05d28d4d9b 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <blk.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/bootretry.c +2 -1
index 8d850df9d487..587b2de7d6b0 100644
@@ -4,12 +4,13 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <bootretry.h>
 #include <cli.h>
 #include <env.h>
 #include <errno.h>
 #include <time.h>
+#include <vsprintf.h>
 #include <watchdog.h>
 
 static uint64_t endtime;  /* must be set, default is instant timeout */
boot/bootstd-uclass.c +0 -1
index 81555d341e32..5de8efce19a5 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootflow.h>
 #include <bootstd.h>
 #include <dm.h>
boot/cedit.c +0 -1
index 8c654dba6dc3..c29a2be14ce2 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_EXPO
 
-#include <common.h>
 #include <abuf.h>
 #include <cedit.h>
 #include <cli.h>
boot/common_fit.c +0 -1
index cde2dc45e907..a2f9b8d83c3b 100644
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <errno.h>
 #include <image.h>
 #include <log.h>
boot/expo.c +0 -1
index cadb6a0ad6e3..ed01483f1d3a 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY	LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>
boot/expo_build.c +0 -1
index 04d88a2c3081..a4df798adebd 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY	LOGC_EXPO
 
-#include <common.h>
 #include <expo.h>
 #include <fdtdec.h>
 #include <log.h>
boot/fdt_simplefb.c +0 -1
index 837920bd3a33..53415548459a 100644
@@ -6,7 +6,6 @@
  * Stephen Warren <[email protected]>
  */
 
-#include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
 #include <asm/global_data.h>
boot/fdt_support.c +0 -1
index 2bd80a9dfb18..874ca4d6f5af 100644
@@ -6,7 +6,6 @@
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  */
 
-#include <common.h>
 #include <abuf.h>
 #include <env.h>
 #include <log.h>
boot/image-android-dt.c +0 -1
index fb014190d445..3b25018c2e77 100644
@@ -6,7 +6,6 @@
 
 #include <image-android-dt.h>
 #include <dt_table.h>
-#include <common.h>
 #include <linux/libfdt.h>
 #include <mapmem.h>
 
boot/image-android.c +0 -1
index 88e40bc7ec6c..ddd8ffd5e540 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2011 Sebastian Andrzej Siewior <[email protected]>
  */
 
-#include <common.h>
 #include <env.h>
 #include <image.h>
 #include <image-android-dt.h>
boot/image-board.c +1 -1
index 09b6e4e0bdca..b7884b8c5dc7 100644
@@ -8,7 +8,7 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
+#include <config.h>
 #include <bootstage.h>
 #include <cpu_func.h>
 #include <display_options.h>
boot/image-cipher.c +0 -1
index b9061489396c..9d389f26cea5 100644
@@ -7,7 +7,6 @@
 #include "mkimage.h"
 #include <time.h>
 #else
-#include <common.h>
 #include <malloc.h>
 #include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
boot/image-fdt.c +0 -1
index f09716cba303..56dd7687f51c 100644
@@ -8,7 +8,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
boot/image-fit-sig.c +0 -1
index 12369896fe3f..fe328df4a850 100644
@@ -7,7 +7,6 @@
 #include "mkimage.h"
 #include <time.h>
 #else
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
boot/image-fit.c +0 -1
index 89e377563ce6..fb03cab831bd 100644
@@ -19,7 +19,6 @@
 #else
 #include <linux/compiler.h>
 #include <linux/sizes.h>
-#include <common.h>
 #include <errno.h>
 #include <log.h>
 #include <mapmem.h>
boot/image-pre-load.c +0 -1
index b504ab42a544..cc19017404c8 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2021 Philippe Reynes <[email protected]>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 DECLARE_GLOBAL_DATA_PTR;
 #include <image.h>
boot/image-sig.c +0 -1
index 0421a61b0406..6bc74866eaed 100644
@@ -3,7 +3,6 @@
  * Copyright (c) 2013, Google Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <asm/global_data.h>
boot/image.c +0 -1
index 073931cd7a3f..eb12e4be04ac 100644
@@ -7,7 +7,6 @@
  */
 
 #ifndef USE_HOSTCC
-#include <common.h>
 #include <env.h>
 #include <display_options.h>
 #include <init.h>
boot/pxe_utils.c +0 -1
index 962056267503..db2ae7047928 100644
@@ -4,7 +4,6 @@
  * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <env.h>
boot/scene.c +0 -1
index d4dfb49ada15..ac976aa26bbe 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY	LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>
boot/scene_menu.c +0 -1
index 63994165efba..80bd7457cb1a 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY	LOGC_EXPO
 
-#include <common.h>
 #include <dm.h>
 #include <expo.h>
 #include <malloc.h>
boot/scene_textline.c +3 -1
index 6ea072a1c268..bba8663b98da 100644
@@ -8,10 +8,12 @@
 
 #define LOG_CATEGORY	LOGC_EXPO
 
-#include <common.h>
 #include <expo.h>
 #include <menu.h>
+#include <log.h>
 #include <video_console.h>
+#include <linux/errno.h>
+#include <linux/string.h>
 #include "scene_internal.h"
 
 int scene_textline(struct scene *scn, const char *name, uint id, uint max_chars,
boot/vbe.c +0 -1
index 52b328300374..00673de7ee2e 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootmeth.h>
 #include <bootstd.h>
 #include <dm.h>
boot/vbe_request.c +0 -1
index 917251afa1ca..dc15b04f5bbf 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <dm.h>
 #include <event.h>
 #include <image.h>
boot/vbe_simple.c +0 -1
index 12682abd3996..189e86d2a223 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
boot/vbe_simple_fw.c +0 -1
index d59a704ddbad..4d6da9490a76 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <bloblist.h>
 #include <bootdev.h>
 #include <bootflow.h>
boot/vbe_simple_os.c +0 -1
index 84626cdeaf24..b4126d8d2d0b 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
-#include <common.h>
 #include <dm.h>
 #include <bootflow.h>
 #include <vbe.h>
Signature · 1 line
2.34.1
author
#15 lore raw

PATCH 15/18 env: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "env/" files and when needed add missing include files directly.

---
 env/attr.c             | 4 ++--
 env/callback.c         | 1 -
 env/common.c           | 1 -
 env/eeprom.c           | 1 -
 env/env.c              | 2 +-
 env/ext4.c             | 1 -
 env/fat.c              | 1 -
 env/flags.c            | 4 ++--
 env/flash.c            | 1 -
 env/mmc.c              | 1 -
 env/nand.c             | 1 -
 env/nowhere.c          | 1 -
 env/nvram.c            | 1 -
 env/onenand.c          | 1 -
 env/remote.c           | 2 +-
 env/sf.c               | 1 -
 env/ubi.c              | 1 -
 include/env_callback.h | 1 +
 include/env_default.h  | 1 +
 include/env_flags.h    | 2 ++
 20 files changed, 10 insertions(+), 19 deletions(-)
env/attr.c +2 -2
index a958c7148283..fed5b212e2f9 100644
@@ -4,13 +4,13 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
+#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
-#include <stdio.h>
 #include <linux/linux_string.h>
 #else
-#include <common.h>
 #include <slre.h>
+#include <vsprintf.h>
 #endif
 
 #include <env_attr.h>
env/callback.c +0 -1
index 98ddba035ea7..b7cbccd1175f 100644
@@ -4,7 +4,6 @@
  * Joe Hershberger, National Instruments, [email protected]
  */
 
-#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
env/common.c +0 -1
index 48a565107c11..d8c276dddfd9 100644
@@ -7,7 +7,6 @@
  * Andreas Heppel <[email protected]>
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>
env/eeprom.c +0 -1
index 7ce7e9972b29..b290b1013e1c 100644
@@ -7,7 +7,6 @@
  * Andreas Heppel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <eeprom.h>
 #include <env.h>
env/env.c +1 -1
index bae3f6482aea..bcc189e14db7 100644
@@ -4,13 +4,13 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <env.h>
 #include <env_internal.h>
 #include <log.h>
 #include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/bug.h>
+#include <linux/errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
env/ext4.c +0 -1
index da26705b8daf..eb16568bd463 100644
@@ -18,7 +18,6 @@
  * Manjunatha C Achar <[email protected]>
  */
 
-#include <common.h>
 #include <part.h>
 
 #include <command.h>
env/fat.c +0 -1
index 3172130d75d3..2a40f123936c 100644
@@ -6,7 +6,6 @@
  *  Maximilian Schwerin <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
env/flags.c +2 -2
index e2866361dfe4..233fd460d842 100644
@@ -8,9 +8,9 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 
+#include <stdio.h>
 #ifdef USE_HOSTCC /* Eliminate "ANSI does not permit..." warnings */
 #include <stdint.h>
-#include <stdio.h>
 #include "fw_env_private.h"
 #include "fw_env.h"
 #include <env_attr.h>
@@ -18,7 +18,7 @@
 #define env_get fw_getenv
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #else
-#include <common.h>
+#include <linux/kernel.h>
 #include <env_internal.h>
 #endif
 
env/flash.c +0 -1
index 1e75f8c004ee..1bd6e7003d6e 100644
@@ -9,7 +9,6 @@
 
 /* #define DEBUG */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
env/mmc.c +0 -1
index 7afb733e890f..776df0786be5 100644
@@ -5,7 +5,6 @@
 
 /* #define DEBUG */
 
-#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>
env/nand.c +0 -1
index df300b131793..fef5697ec39d 100644
@@ -13,7 +13,6 @@
  * Andreas Heppel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
env/nowhere.c +0 -1
index 9ebc357dbd78..326f27db2e9c 100644
@@ -7,7 +7,6 @@
  * Andreas Heppel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
env/nvram.c +0 -1
index 229c34f5367c..d49cd0f337a0 100644
@@ -7,7 +7,6 @@
  * Andreas Heppel <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <env_internal.h>
env/onenand.c +0 -1
index 1faa2cb62a34..8c349ef5ce6c 100644
@@ -7,7 +7,6 @@
  * Kyungmin Park <[email protected]>
  */
 
-#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
env/remote.c +1 -1
index 166bebf52b5b..0cc383c23602 100644
@@ -5,10 +5,10 @@
 
 /* #define DEBUG */
 
-#include <common.h>
 #include <command.h>
 #include <env_internal.h>
 #include <asm/global_data.h>
+#include <linux/errno.h>
 #include <linux/stddef.h>
 #include <u-boot/crc.h>
 
env/sf.c +0 -1
index 8f5c03b00d33..c747e175e31b 100644
@@ -8,7 +8,6 @@
  *
  * (C) Copyright 2008 Atmel Corporation
  */
-#include <common.h>
 #include <dm.h>
 #include <env.h>
 #include <env_internal.h>
env/ubi.c +0 -1
index 445d34fedb89..0c3e93c2bf2d 100644
@@ -4,7 +4,6 @@
  *        Joe Hershberger <[email protected]>
  */
 
-#include <common.h>
 #include <asm/global_data.h>
 
 #include <command.h>
include/env_callback.h +1 -0
index 23bc650c162d..8e500aaaf806 100644
@@ -7,6 +7,7 @@
 #ifndef __ENV_CALLBACK_H__
 #define __ENV_CALLBACK_H__
 
+#include <config.h>
 #include <env_flags.h>
 #include <linker_lists.h>
 #include <search.h>
include/env_default.h +1 -0
index 8ee500d1709c..076ffdd44e9b 100644
@@ -7,6 +7,7 @@
  * Andreas Heppel <[email protected]>
  */
 
+#include <config.h>
 #include <env_callback.h>
 #include <linux/stringify.h>
 
include/env_flags.h +2 -0
index d785f87cdcbe..2476043b0e38 100644
@@ -7,6 +7,8 @@
 #ifndef __ENV_FLAGS_H__
 #define __ENV_FLAGS_H__
 
+#include <config.h>
+
 enum env_flags_vartype {
 	env_flags_vartype_string,
 	env_flags_vartype_decimal,
Signature · 1 line
2.34.1
author
#16 lore raw

PATCH 16/18 net: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "net/" files and when needed add missing include files directly.

---
 net/arp.c             | 2 +-
 net/bootp.c           | 1 -
 net/cdp.c             | 1 -
 net/dhcpv6.c          | 1 -
 net/dns.c             | 1 -
 net/eth-uclass.c      | 1 -
 net/eth_bootdev.c     | 1 -
 net/eth_common.c      | 1 -
 net/fastboot_tcp.c    | 1 -
 net/fastboot_udp.c    | 1 -
 net/link_local.c      | 1 -
 net/mdio-mux-uclass.c | 1 -
 net/mdio-uclass.c     | 1 -
 net/ndisc.c           | 1 -
 net/net.c             | 1 -
 net/net6.c            | 2 +-
 net/nfs.c             | 1 -
 net/pcap.c            | 2 +-
 net/ping6.c           | 1 -
 net/rarp.c            | 1 -
 net/sntp.c            | 1 -
 net/tcp.c             | 1 -
 net/tftp.c            | 1 -
 net/udp.c             | 1 -
 net/wget.c            | 1 -
 net/wol.c             | 1 -
 26 files changed, 3 insertions(+), 26 deletions(-)
net/arp.c +1 -1
index 37848ad32fbd..bc1e25f941f7 100644
@@ -9,10 +9,10 @@
  *	Copyright 2000-2002 Wolfgang Denk, [email protected]
  */
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
+#include <vsprintf.h>
 #include <linux/delay.h>
 
 #include "arp.h"
net/bootp.c +0 -1
index c15472f5d37f..5efee7f37776 100644
@@ -8,7 +8,6 @@
  *	Copyright 2000-2004 Wolfgang Denk, [email protected]
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <env.h>
net/cdp.c +0 -1
index a8f890e75226..d4cfc587ee35 100644
@@ -9,7 +9,6 @@
  *	Copyright 2000-2002 Wolfgang Denk, [email protected]
  */
 
-#include <common.h>
 #include <net.h>
 
 #include "cdp.h"
net/dhcpv6.c +0 -1
index 4aea779f6f24..54619ee69836 100644
@@ -7,7 +7,6 @@
 
 /* Simple DHCP6 network layer implementation. */
 
-#include <common.h>
 #include <net6.h>
 #include <malloc.h>
 #include <linux/delay.h>
net/dns.c +0 -1
index 5b1fe5b01037..c2f0ab98c8d0 100644
@@ -22,7 +22,6 @@
  * this stuff is worth it, you can buy me a beer in return.
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <log.h>
net/eth-uclass.c +0 -1
index 3d0ec91dfa49..4e3933fd05f3 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY UCLASS_ETH
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootstage.h>
 #include <dm.h>
net/eth_bootdev.c +0 -1
index 869adf8cbbd3..6ee54e3c7901 100644
@@ -8,7 +8,6 @@
 
 #define LOG_CATEGORY UCLASS_BOOTSTD
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <command.h>
net/eth_common.c +0 -1
index 14d4c07b695d..89b5bb371897 100644
@@ -5,7 +5,6 @@
  * Joe Hershberger, National Instruments
  */
 
-#include <common.h>
 #include <bootstage.h>
 #include <dm.h>
 #include <env.h>
net/fastboot_tcp.c +0 -1
index 2eb52ea25679..d1fccbc72386 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2023 The Android Open Source Project
  */
 
-#include <common.h>
 #include <fastboot.h>
 #include <net.h>
 #include <net/fastboot_tcp.h>
net/fastboot_udp.c +0 -1
index 6fee441ab3b6..d1479510d61a 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2016 The Android Open Source Project
  */
 
-#include <common.h>
 #include <command.h>
 #include <fastboot.h>
 #include <net.h>
net/link_local.c +0 -1
index 8aec3c79969b..179721333ffc 100644
@@ -11,7 +11,6 @@
  * Licensed under the GPL v2 or later
  */
 
-#include <common.h>
 #include <env.h>
 #include <log.h>
 #include <net.h>
net/mdio-mux-uclass.c +0 -1
index 94b90e065762..ee188b504d16 100644
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <miiphy.h>
net/mdio-uclass.c +0 -1
index 0ebfb2f1343a..4f052ae432c6 100644
@@ -4,7 +4,6 @@
  * Alex Marginean, NXP
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/lists.h>
 #include <eth_phy.h>
net/ndisc.c +0 -1
index d1cec0601c83..d417c5987ac4 100644
@@ -9,7 +9,6 @@
 
 /* Neighbour Discovery for IPv6 */
 
-#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>
net/net.c +0 -1
index 0fb2d2507734..23b5d3356afa 100644
@@ -81,7 +81,6 @@
  */
 
 
-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <console.h>
net/net6.c +1 -1
index 2dd64c0e1618..4cff98df15cf 100644
@@ -9,12 +9,12 @@
 
 /* Simple IPv6 network layer implementation */
 
-#include <common.h>
 #include <env_internal.h>
 #include <malloc.h>
 #include <net.h>
 #include <net6.h>
 #include <ndisc.h>
+#include <vsprintf.h>
 
 /* NULL IPv6 address */
 struct in6_addr const net_null_addr_ip6 = ZERO_IPV6_ADDR;
net/nfs.c +0 -1
index c18282448ccd..acc7106f10d4 100644
@@ -30,7 +30,6 @@
  * September 27, 2018. As of now, NFSv3 is the default choice. If the server
  * does not support NFSv3, we fall back to versions 2 or 1. */
 
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #ifdef CONFIG_SYS_DIRECT_FLASH_NFS
net/pcap.c +1 -1
index 4036d8a3fa53..c959e3e4e511 100644
@@ -3,10 +3,10 @@
  * Copyright 2019 Ramon Fried <[email protected]>
  */
 
-#include <common.h>
 #include <net.h>
 #include <net/pcap.h>
 #include <time.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 #define LINKTYPE_ETHERNET	1
net/ping6.c +0 -1
index 4882a17f510b..2479e08fd82f 100644
@@ -9,7 +9,6 @@
 
 /* Simple ping6 implementation */
 
-#include <common.h>
 #include <net.h>
 #include <net6.h>
 #include "ndisc.h"
net/rarp.c +0 -1
index 231b6233c07a..a6b564e314d4 100644
@@ -4,7 +4,6 @@
  * Wolfgang Denk, DENX Software Engineering, [email protected].
  */
 
-#include <common.h>
 #include <command.h>
 #include <log.h>
 #include <net.h>
net/sntp.c +0 -1
index dac0f8ceea1b..73d1d87d38b1 100644
@@ -5,7 +5,6 @@
  *
  */
 
-#include <common.h>
 #include <command.h>
 #include <dm.h>
 #include <log.h>
net/tcp.c +0 -1
index a713e1dd6096..b0cc8a1fe3ed 100644
@@ -17,7 +17,6 @@
  *                      - TCP application (eg wget)
  *      Next Step       HTTPS?
  */
-#include <common.h>
 #include <command.h>
 #include <console.h>
 #include <env_internal.h>
net/tftp.c +0 -1
index 2e335413492b..6b16bdcbe4c2 100644
@@ -5,7 +5,6 @@
  * Copyright 2011 Comelit Group SpA,
  *                Luca Ceresoli <[email protected]>
  */
-#include <common.h>
 #include <command.h>
 #include <display_options.h>
 #include <efi_loader.h>
net/udp.c +0 -1
index a93822f511cd..37162260d175 100644
@@ -3,7 +3,6 @@
  * Copyright (C) 2020 Philippe Reynes <[email protected]>
  */
 
-#include <common.h>
 #include <net.h>
 #include <net/udp.h>
 
net/wget.c +0 -1
index abab371e58ed..f1dd7abeff69 100644
@@ -6,7 +6,6 @@
 
 #include <asm/global_data.h>
 #include <command.h>
-#include <common.h>
 #include <display_options.h>
 #include <env.h>
 #include <image.h>
net/wol.c +0 -1
index 0a625668a992..96478ba5751e 100644
@@ -3,7 +3,6 @@
  * Copyright 2018 Lothar Felten, [email protected]
  */
 
-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <net.h>
Signature · 1 line
2.34.1
author
#17 lore raw

PATCH 17/18 fs: Remove <common.h> and add needed includes

In reply to Tom Rini

Remove <common.h> from all "fs/" files and when needed add missing include files directly.

---
 fs/btrfs/dev.c               | 1 -
 fs/btrfs/disk-io.c           | 1 -
 fs/btrfs/volumes.c           | 2 +-
 fs/cbfs/cbfs.c               | 2 +-
 fs/cramfs/cramfs.c           | 2 +-
 fs/cramfs/uncompress.c       | 2 +-
 fs/ext4/dev.c                | 1 -
 fs/ext4/ext4_common.c        | 1 -
 fs/ext4/ext4_journal.c       | 1 -
 fs/ext4/ext4_write.c         | 1 -
 fs/ext4/ext4fs.c             | 1 -
 fs/fat/fat.c                 | 1 -
 fs/fat/fat_write.c           | 1 -
 fs/fs.c                      | 2 +-
 fs/fs_internal.c             | 1 -
 fs/jffs2/compr_zlib.c        | 2 --
 fs/jffs2/jffs2_1pass.c       | 1 -
 fs/jffs2/mergesort.c         | 1 -
 fs/sandbox/host_bootdev.c    | 1 -
 fs/sandbox/sandboxfs.c       | 2 +-
 fs/semihostingfs.c           | 2 +-
 fs/ubifs/super.c             | 1 -
 fs/ubifs/ubifs.c             | 1 -
 fs/yaffs2/yaffs_mtdif.c      | 1 -
 fs/yaffs2/yaffs_mtdif2.c     | 1 -
 fs/yaffs2/yaffs_uboot_glue.c | 1 -
 fs/zfs/dev.c                 | 1 -
 fs/zfs/zfs.c                 | 1 -
 fs/zfs/zfs_fletcher.c        | 1 -
 fs/zfs/zfs_lzjb.c            | 1 -
 fs/zfs/zfs_sha256.c          | 1 -
 include/jffs2/load_kernel.h  | 1 +
 32 files changed, 8 insertions(+), 32 deletions(-)
fs/btrfs/dev.c +0 -1
index cb3b9713a5f4..e27a032c9f69 100644
@@ -5,7 +5,6 @@
  * 2017 Marek Behún, CZ.NIC, [email protected]
  */
 
-#include <common.h>
 #include <blk.h>
 #include <compiler.h>
 #include <fs_internal.h>
fs/btrfs/disk-io.c +0 -1
index 7eaa7e949604..e5bfaf461c2b 100644
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0+
-#include <common.h>
 #include <fs_internal.h>
 #include <log.h>
 #include <uuid.h>
fs/btrfs/volumes.c +1 -1
index 7d4095d9ca88..8ec545eded7b 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 #include <stdlib.h>
-#include <common.h>
+#include <errno.h>
 #include <fs_internal.h>
 #include "ctree.h"
 #include "disk-io.h"
fs/cbfs/cbfs.c +1 -1
index 714f4baafc9e..ad5583233bb1 100644
@@ -3,10 +3,10 @@
  * Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
  */
 
-#include <common.h>
 #include <cbfs.h>
 #include <log.h>
 #include <malloc.h>
+#include <linux/errno.h>
 #include <asm/byteorder.h>
 
 /* Offset of master header from the start of a coreboot ROM */
fs/cramfs/cramfs.c +1 -1
index abb2de34eb05..22148ff8fe27 100644
@@ -24,7 +24,7 @@
  * The actual compression is based on zlib, see the other files.
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/stat.h>
fs/cramfs/uncompress.c +1 -1
index 0d071b69f4cc..2141edf22e4a 100644
@@ -20,7 +20,7 @@
  * then is used by multiple filesystems.
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <cyclic.h>
 #include <malloc.h>
 #include <watchdog.h>
fs/ext4/dev.c +0 -1
index 168443de1ff7..3fd8980b1d69 100644
@@ -22,7 +22,6 @@
  *		fs/ext2/dev.c file in uboot.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <config.h>
 #include <fs_internal.h>
fs/ext4/ext4_common.c +0 -1
index 2ff0dca2495e..857c15d878e4 100644
@@ -18,7 +18,6 @@
  * ext4write : Based on generic ext4 protocol.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
fs/ext4/ext4_journal.c +0 -1
index e80f797c8dc9..02c4ac2cb931 100644
@@ -13,7 +13,6 @@
  * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved
  */
 
-#include <common.h>
 #include <blk.h>
 #include <ext4fs.h>
 #include <log.h>
fs/ext4/ext4_write.c +0 -1
index d057f6b5a794..38da3923c477 100644
@@ -21,7 +21,6 @@
  */
 
 
-#include <common.h>
 #include <blk.h>
 #include <log.h>
 #include <malloc.h>
fs/ext4/ext4fs.c +0 -1
index 33e200ffa3c5..da59cb008fce 100644
@@ -20,7 +20,6 @@
  * ext4write : Based on generic ext4 protocol.
  */
 
-#include <common.h>
 #include <blk.h>
 #include <ext_common.h>
 #include <ext4fs.h>
fs/fat/fat.c +0 -1
index 2dd9d4e72dcc..e2570e816768 100644
@@ -10,7 +10,6 @@
 
 #define LOG_CATEGORY	LOGC_FS
 
-#include <common.h>
 #include <blk.h>
 #include <config.h>
 #include <exports.h>
fs/fat/fat_write.c +0 -1
index c8e0fbf1a3b3..ea877ee9171b 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY LOGC_FS
 
-#include <common.h>
 #include <command.h>
 #include <config.h>
 #include <div64.h>
fs/fs.c +1 -1
index acf465bdd807..bed1f7242f41 100644
@@ -9,7 +9,6 @@
 #include <config.h>
 #include <display_options.h>
 #include <errno.h>
-#include <common.h>
 #include <env.h>
 #include <lmb.h>
 #include <log.h>
@@ -21,6 +20,7 @@
 #include <fs.h>
 #include <sandboxfs.h>
 #include <semihostingfs.h>
+#include <time.h>
 #include <ubifs_uboot.h>
 #include <btrfs.h>
 #include <asm/global_data.h>
fs/fs_internal.c +0 -1
index 111f91b355d1..51c1719361b1 100644
@@ -7,7 +7,6 @@
 
 #define LOG_CATEGORY LOGC_CORE
 
-#include <common.h>
 #include <blk.h>
 #include <compiler.h>
 #include <log.h>
fs/jffs2/compr_zlib.c +0 -2
index d306b6dc4cfe..e1e3c15e75e1 100644
@@ -35,8 +35,6 @@
  *
  */
 
-#include <common.h>
-#include <config.h>
 #include <jffs2/jffs2.h>
 #include <jffs2/mini_inflate.h>
 
fs/jffs2/jffs2_1pass.c +0 -1
index 49ba82ef9596..5b7d7f4ae881 100644
@@ -111,7 +111,6 @@
  */
 
 
-#include <common.h>
 #include <config.h>
 #include <malloc.h>
 #include <div64.h>
fs/jffs2/mergesort.c +0 -1
index fca77aa65114..495937d792db 100644
@@ -7,7 +7,6 @@
  * http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html
  */
 
-#include <common.h>
 #include "jffs2_private.h"
 
 int sort_list(struct b_list *list)
fs/sandbox/host_bootdev.c +0 -1
index 3ef53627608a..3f74972a9f81 100644
@@ -6,7 +6,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
-#include <common.h>
 #include <bootdev.h>
 #include <bootflow.h>
 #include <bootmeth.h>
fs/sandbox/sandboxfs.c +1 -1
index 4ae41d5b4db1..773b583fa43e 100644
@@ -3,7 +3,7 @@
  * Copyright (c) 2012, Google Inc.
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <fs.h>
 #include <malloc.h>
 #include <os.h>
fs/semihostingfs.c +1 -1
index 3592338a6865..77e39ca407e4 100644
@@ -4,7 +4,7 @@
  * Copyright (c) 2012, Google Inc.
  */
 
-#include <common.h>
+#include <stdio.h>
 #include <fs.h>
 #include <malloc.h>
 #include <os.h>
fs/ubifs/super.c +0 -1
index 3e7160352e6c..788f88f04952 100644
@@ -29,7 +29,6 @@
 #include <linux/writeback.h>
 #else
 
-#include <common.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <linux/bitops.h>
fs/ubifs/ubifs.c +0 -1
index a509584e5d71..75de01e95f7c 100644
@@ -11,7 +11,6 @@
  *          Adrian Hunter
  */
 
-#include <common.h>
 #include <env.h>
 #include <gzip.h>
 #include <log.h>
fs/yaffs2/yaffs_mtdif.c +0 -1
index 50fed2d4b150..0eec22bc4a54 100644
@@ -12,7 +12,6 @@
  */
 
 /* XXX U-BOOT XXX */
-#include <common.h>
 
 #include "yportenv.h"
 
fs/yaffs2/yaffs_mtdif2.c +0 -1
index 81a4d964f3e9..2bf171f99f13 100644
@@ -14,7 +14,6 @@
 /* mtd interface for YAFFS2 */
 
 /* XXX U-BOOT XXX */
-#include <common.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
 
fs/yaffs2/yaffs_uboot_glue.c +0 -1
index 0a920561149a..deddbaac51eb 100644
@@ -19,7 +19,6 @@
  * This version now uses the ydevconfig mechanism to set up partitions.
  */
 
-#include <common.h>
 #include <div64.h>
 #include <malloc.h>
 #include <linux/printk.h>
fs/zfs/dev.c +0 -1
index fcd9893b3ac2..722c6a86176c 100644
@@ -8,7 +8,6 @@
  */
 
 
-#include <common.h>
 #include <config.h>
 #include <fs_internal.h>
 #include <zfs_common.h>
fs/zfs/zfs.c +0 -1
index bfc11fa6676b..c44e7ece5dfb 100644
@@ -10,7 +10,6 @@
  *	Copyright 2004	Sun Microsystems, Inc.
  */
 
-#include <common.h>
 #include <log.h>
 #include <malloc.h>
 #include <linux/stat.h>
fs/zfs/zfs_fletcher.c +0 -1
index 008a303ec796..b06c335626a4 100644
@@ -8,7 +8,6 @@
  * Use is subject to license terms.
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
fs/zfs/zfs_lzjb.c +0 -1
index b42d4980129f..e79c5b4278fd 100644
@@ -8,7 +8,6 @@
  * Use is subject to license terms.
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
fs/zfs/zfs_sha256.c +0 -1
index cb5b1c06834d..602d75254ff9 100644
@@ -8,7 +8,6 @@
  * Use is subject to license terms.
  */
 
-#include <common.h>
 #include <malloc.h>
 #include <linux/stat.h>
 #include <linux/time.h>
include/jffs2/load_kernel.h +1 -0
index 9346d7ee9f1b..fa4600e84fc0 100644
@@ -10,6 +10,7 @@
  *-----------------------------------------------------------------------*/
 
 #include <linux/list.h>
+#include <linux/string.h>
 
 /* mtd device types */
 #define MTD_DEV_TYPE_NOR	0x0001
Signature · 1 line
2.34.1