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

Signed-off-by: Tom Rini trini@konsulko.com --- include/pci.h | 1 + 1 file changed, 1 insertion(+)

diff --git a/include/pci.h b/include/pci.h index aad233769a35..ea3b73923d60 100644 --- a/include/pci.h +++ b/include/pci.h @@ -520,6 +520,7 @@

#ifndef __ASSEMBLY__

+#include <linux/types.h> #include <dm/pci.h>

#ifdef CONFIG_SYS_PCI_64BIT

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

Signed-off-by: Tom Rini trini@konsulko.com --- cmd/Kconfig | 8 ++++++-- env/Kconfig | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig index c182d73ddbd7..d9df34942d4f 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -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. diff --git a/env/Kconfig b/env/Kconfig index 1f8e90af55e5..9641abe371a0 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -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.

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

Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c index de7bfa947f11..792fa01ab9e2 100644 --- a/arch/nios2/cpu/cpu.c +++ b/arch/nios2/cpu/cpu.c @@ -4,7 +4,7 @@ * Scott McNutt smcnutt@psyent.com */

-#include <common.h> +#include <config.h> #include <command.h> #include <cpu.h> #include <cpu_func.h> diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c index 90cabb67571b..27093c4faa3d 100644 --- a/arch/nios2/cpu/interrupts.c +++ b/arch/nios2/cpu/interrupts.c @@ -7,7 +7,6 @@ * Scott McNutt smcnutt@psyent.com */

-#include <common.h> #include <command.h> #include <irq_func.h> #include <asm/nios2.h> diff --git a/arch/nios2/cpu/traps.c b/arch/nios2/cpu/traps.c index 087a05097d9e..59690214f14e 100644 --- a/arch/nios2/cpu/traps.c +++ b/arch/nios2/cpu/traps.c @@ -4,8 +4,8 @@ * Scott McNutt smcnutt@psyent.com */

-#include <common.h> #include <hang.h> +#include <stdio.h> #include <asm/ptrace.h>

void trap_handler (struct pt_regs *regs) diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index 657a17c7204f..ce939ff5e15a 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -4,7 +4,6 @@ * Scott McNutt smcnutt@psyent.com */

-#include <common.h> #include <bootm.h> #include <cpu_func.h> #include <env.h> diff --git a/arch/nios2/lib/cache.c b/arch/nios2/lib/cache.c index 5864d8f0f473..8f543f2a2f26 100644 --- a/arch/nios2/lib/cache.c +++ b/arch/nios2/lib/cache.c @@ -5,7 +5,6 @@ * Implemented by fredrik.markstrom@gmail.com and ivarholmqvist@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <asm/cache.h> #include <asm/global_data.h>

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

Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Simon Glass sjg@chromium.org Cc: Bin Meng bmeng.cn@gmail.com --- 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(-)

diff --git a/arch/x86/cpu/acpi_gpe.c b/arch/x86/cpu/acpi_gpe.c index da01e71335f1..13fe695014be 100644 --- a/arch/x86/cpu/acpi_gpe.c +++ b/arch/x86/cpu/acpi_gpe.c @@ -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> diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index c610a7f44770..76230aea837d 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -10,7 +10,6 @@

#define LOG_CATEGORY LOGC_ACPI

-#include <common.h> #include <cpu.h> #include <dm.h> #include <log.h> diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c index 647c9df6a72b..f480bb1d8c34 100644 --- a/arch/x86/cpu/apollolake/cpu.c +++ b/arch/x86/cpu/apollolake/cpu.c @@ -3,7 +3,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <log.h> diff --git a/arch/x86/cpu/apollolake/cpu_common.c b/arch/x86/cpu/apollolake/cpu_common.c index 9a5502617bf5..498b306cd618 100644 --- a/arch/x86/cpu/apollolake/cpu_common.c +++ b/arch/x86/cpu/apollolake/cpu_common.c @@ -3,7 +3,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <dm.h> #include <log.h> #include <asm/cpu_common.h> diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c index 8f48457ee220..8798fa79d4c1 100644 --- a/arch/x86/cpu/apollolake/cpu_spl.c +++ b/arch/x86/cpu/apollolake/cpu_spl.c @@ -5,7 +5,6 @@ * Portions taken from coreboot */

-#include <common.h> #include <dm.h> #include <ec_commands.h> #include <init.h> diff --git a/arch/x86/cpu/apollolake/fsp_bindings.c b/arch/x86/cpu/apollolake/fsp_bindings.c index fb75e1f70951..f6fbddce922a 100644 --- a/arch/x86/cpu/apollolake/fsp_bindings.c +++ b/arch/x86/cpu/apollolake/fsp_bindings.c @@ -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> diff --git a/arch/x86/cpu/apollolake/fsp_m.c b/arch/x86/cpu/apollolake/fsp_m.c index c6be707e4eaf..19065e17ae04 100644 --- a/arch/x86/cpu/apollolake/fsp_m.c +++ b/arch/x86/cpu/apollolake/fsp_m.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <log.h> #include <asm/arch/iomap.h> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c index a9b13c0c7047..5fca19f90d38 100644 --- a/arch/x86/cpu/apollolake/fsp_s.c +++ b/arch/x86/cpu/apollolake/fsp_s.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <binman.h> #include <bootstage.h> #include <dm.h> diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c index 2405dec8525b..9ee362239efe 100644 --- a/arch/x86/cpu/apollolake/hostbridge.c +++ b/arch/x86/cpu/apollolake/hostbridge.c @@ -11,7 +11,6 @@

#define LOG_CATEGORY UCLASS_NORTHBRIDGE

-#include <common.h> #include <dm.h> #include <dt-structs.h> #include <log.h> diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c index 4be6366f0438..531ff1cd91f4 100644 --- a/arch/x86/cpu/apollolake/lpc.c +++ b/arch/x86/cpu/apollolake/lpc.c @@ -5,7 +5,6 @@ * From coreboot Apollo Lake support lpc.c */

-#include <common.h> #include <dm.h> #include <log.h> #include <spl.h> diff --git a/arch/x86/cpu/apollolake/pch.c b/arch/x86/cpu/apollolake/pch.c index a0f9b031dea3..32190312ff8c 100644 --- a/arch/x86/cpu/apollolake/pch.c +++ b/arch/x86/cpu/apollolake/pch.c @@ -3,7 +3,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <dm.h> #include <pch.h> #include <spl.h> diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c index 163119e2e9e9..32fd0344861e 100644 --- a/arch/x86/cpu/apollolake/pmc.c +++ b/arch/x86/cpu/apollolake/pmc.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_ACPI_PMC

-#include <common.h> #include <dm.h> #include <dt-structs.h> #include <log.h> diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c index 5ed7963579ea..b1503c25140a 100644 --- a/arch/x86/cpu/apollolake/punit.c +++ b/arch/x86/cpu/apollolake/punit.c @@ -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> diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c index 6078d5a200e8..b351d73e7d8b 100644 --- a/arch/x86/cpu/apollolake/spl.c +++ b/arch/x86/cpu/apollolake/spl.c @@ -5,7 +5,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <binman_sym.h> #include <bootstage.h> #include <dm.h> diff --git a/arch/x86/cpu/apollolake/systemagent.c b/arch/x86/cpu/apollolake/systemagent.c index b6bc2ba14f15..f966b9083fc2 100644 --- a/arch/x86/cpu/apollolake/systemagent.c +++ b/arch/x86/cpu/apollolake/systemagent.c @@ -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> diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c index a9362436000c..7e4c816dcef0 100644 --- a/arch/x86/cpu/apollolake/uart.c +++ b/arch/x86/cpu/apollolake/uart.c @@ -7,7 +7,6 @@ * Some code from coreboot lpss.c */

-#include <common.h> #include <dm.h> #include <dt-structs.h> #include <malloc.h> diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index ccc4851b1881..7821964f1fca 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -3,7 +3,6 @@ * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <log.h> diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c index c270426d8208..7756a1a4a8e8 100644 --- a/arch/x86/cpu/baytrail/cpu.c +++ b/arch/x86/cpu/baytrail/cpu.c @@ -5,7 +5,6 @@ * Based on code from coreboot */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <event.h> diff --git a/arch/x86/cpu/baytrail/early_uart.c b/arch/x86/cpu/baytrail/early_uart.c index 08dbd5538f7a..3736127239e5 100644 --- a/arch/x86/cpu/baytrail/early_uart.c +++ b/arch/x86/cpu/baytrail/early_uart.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <errno.h> #include <asm/io.h>

diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c index fb3f946c45f9..9eb456f90d10 100644 --- a/arch/x86/cpu/baytrail/fsp_configs.c +++ b/arch/x86/cpu/baytrail/fsp_configs.c @@ -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> diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index f73738ce5c01..839ff4d2bf21 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#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 */ diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c index 3345049993d6..8cf4b628d41a 100644 --- a/arch/x86/cpu/braswell/braswell.c +++ b/arch/x86/cpu/braswell/braswell.c @@ -3,10 +3,10 @@ * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com */

-#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) { diff --git a/arch/x86/cpu/braswell/early_uart.c b/arch/x86/cpu/braswell/early_uart.c index d78c6b0feb6a..8b28d28d1366 100644 --- a/arch/x86/cpu/braswell/early_uart.c +++ b/arch/x86/cpu/braswell/early_uart.c @@ -3,7 +3,6 @@ * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <asm/io.h>

#define PCI_DEV_CONFIG(segbus, dev, fn) ( \ diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c index 243298fd5718..aaf3e67f81cc 100644 --- a/arch/x86/cpu/braswell/fsp_configs.c +++ b/arch/x86/cpu/braswell/fsp_configs.c @@ -3,7 +3,6 @@ * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <fdtdec.h> #include <log.h> #include <asm/fsp1/fsp_support.h> diff --git a/arch/x86/cpu/broadwell/adsp.c b/arch/x86/cpu/broadwell/adsp.c index 1fa18237809c..90b2449475e5 100644 --- a/arch/x86/cpu/broadwell/adsp.c +++ b/arch/x86/cpu/broadwell/adsp.c @@ -9,7 +9,6 @@

#define LOG_CATEGORY UCLASS_SYSCON

-#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c index cbd4a3b67973..dc6717eca40e 100644 --- a/arch/x86/cpu/broadwell/cpu.c +++ b/arch/x86/cpu/broadwell/cpu.c @@ -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> diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c index df5a9675ee4b..a48be2959943 100644 --- a/arch/x86/cpu/broadwell/cpu_from_spl.c +++ b/arch/x86/cpu/broadwell/cpu_from_spl.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#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) { diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c index 2049dbfe24a5..c43fb7a608b4 100644 --- a/arch/x86/cpu/broadwell/cpu_full.c +++ b/arch/x86/cpu/broadwell/cpu_full.c @@ -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> diff --git a/arch/x86/cpu/broadwell/iobp.c b/arch/x86/cpu/broadwell/iobp.c index cb5595c930e1..f8b2a60d09f1 100644 --- a/arch/x86/cpu/broadwell/iobp.c +++ b/arch/x86/cpu/broadwell/iobp.c @@ -5,7 +5,6 @@ * Modified from coreboot */

-#include <common.h> #include <errno.h> #include <asm/intel_regs.h> #include <asm/io.h> diff --git a/arch/x86/cpu/broadwell/lpc.c b/arch/x86/cpu/broadwell/lpc.c index d2638a4e7a6b..b945693f1cf9 100644 --- a/arch/x86/cpu/broadwell/lpc.c +++ b/arch/x86/cpu/broadwell/lpc.c @@ -5,7 +5,6 @@ * From coreboot broadwell support */

-#include <common.h> #include <dm.h> #include <log.h> #include <pch.h> diff --git a/arch/x86/cpu/broadwell/me.c b/arch/x86/cpu/broadwell/me.c index ae16ce264992..3399d822e5b6 100644 --- a/arch/x86/cpu/broadwell/me.c +++ b/arch/x86/cpu/broadwell/me.c @@ -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> diff --git a/arch/x86/cpu/broadwell/northbridge.c b/arch/x86/cpu/broadwell/northbridge.c index 141babc51c3a..d67ab03627d1 100644 --- a/arch/x86/cpu/broadwell/northbridge.c +++ b/arch/x86/cpu/broadwell/northbridge.c @@ -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> diff --git a/arch/x86/cpu/broadwell/pch.c b/arch/x86/cpu/broadwell/pch.c index 37fcddbb9b03..2c8b7380d962 100644 --- a/arch/x86/cpu/broadwell/pch.c +++ b/arch/x86/cpu/broadwell/pch.c @@ -3,7 +3,6 @@ * Copyright (c) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <log.h> #include <pch.h> diff --git a/arch/x86/cpu/broadwell/pinctrl_broadwell.c b/arch/x86/cpu/broadwell/pinctrl_broadwell.c index 85bd37101ba2..b6313c3466a4 100644 --- a/arch/x86/cpu/broadwell/pinctrl_broadwell.c +++ b/arch/x86/cpu/broadwell/pinctrl_broadwell.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/broadwell/power_state.c b/arch/x86/cpu/broadwell/power_state.c index 62fd2e8d2c0e..e1d60915f55a 100644 --- a/arch/x86/cpu/broadwell/power_state.c +++ b/arch/x86/cpu/broadwell/power_state.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Google, Inc. */

-#include <common.h> #include <log.h> #include <pci.h> #include <asm/io.h> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c index df2df7972e98..653d31dd67c5 100644 --- a/arch/x86/cpu/broadwell/refcode.c +++ b/arch/x86/cpu/broadwell/refcode.c @@ -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> diff --git a/arch/x86/cpu/broadwell/sata.c b/arch/x86/cpu/broadwell/sata.c index be3c9e764ef3..0f67ba9666f6 100644 --- a/arch/x86/cpu/broadwell/sata.c +++ b/arch/x86/cpu/broadwell/sata.c @@ -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> diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c index d30ebee021ea..cd534a17cf15 100644 --- a/arch/x86/cpu/broadwell/sdram.c +++ b/arch/x86/cpu/broadwell/sdram.c @@ -7,7 +7,6 @@

#define LOG_CATEGORY UCLASS_RAM

-#include <common.h> #include <dm.h> #include <init.h> #include <log.h> diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 82fe4c71cd27..d474c79e25ef 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -5,7 +5,6 @@ * Graeme Russ, graeme.russ@gmail.com. */

-#include <common.h> #include <cpu_func.h> #include <event.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/coreboot/coreboot_spl.c b/arch/x86/cpu/coreboot/coreboot_spl.c index 36661871e923..566c65a96aed 100644 --- a/arch/x86/cpu/coreboot/coreboot_spl.c +++ b/arch/x86/cpu/coreboot/coreboot_spl.c @@ -3,7 +3,6 @@ * Copyright 2020 Google LLC */

-#include <common.h> #include <init.h>

int dram_init(void) diff --git a/arch/x86/cpu/coreboot/sdram.c b/arch/x86/cpu/coreboot/sdram.c index 26352df421f7..ee0491eab1c8 100644 --- a/arch/x86/cpu/coreboot/sdram.c +++ b/arch/x86/cpu/coreboot/sdram.c @@ -5,11 +5,11 @@ * Graeme Russ, graeme.russ@gmail.com */

-#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;

diff --git a/arch/x86/cpu/coreboot/timestamp.c b/arch/x86/cpu/coreboot/timestamp.c index 3ad611a530c4..ec4003c4e77e 100644 --- a/arch/x86/cpu/coreboot/timestamp.c +++ b/arch/x86/cpu/coreboot/timestamp.c @@ -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"); diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index ce55efc454bf..c8433360f28e 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -20,7 +20,6 @@

#define LOG_CATEGORY UCLASS_CPU

-#include <common.h> #include <bootstage.h> #include <command.h> #include <cpu_func.h> diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c index 59da41f38333..6c53f0ea821f 100644 --- a/arch/x86/cpu/cpu_x86.c +++ b/arch/x86/cpu/cpu_x86.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c index f754489784a7..218a68c4642d 100644 --- a/arch/x86/cpu/efi/app.c +++ b/arch/x86/cpu/efi/app.c @@ -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) { diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 708bfbe7ee48..cb57f15f710b 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#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;

diff --git a/arch/x86/cpu/efi/sdram.c b/arch/x86/cpu/efi/sdram.c index 56f3326146ca..1f0e87735b21 100644 --- a/arch/x86/cpu/efi/sdram.c +++ b/arch/x86/cpu/efi/sdram.c @@ -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; diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 8882532ebf3a..db2727d74851 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -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;

diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index f3f3527237f2..b3f4214acdb7 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -10,7 +10,6 @@ * Copyright (C) 1991, 1992 Linus Torvalds */

-#include <common.h> #include <dm.h> #include <efi_loader.h> #include <hang.h> diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index d94ec208f65d..29676b4abfae 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -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> diff --git a/arch/x86/cpu/intel_common/car.S b/arch/x86/cpu/intel_common/car.S index 00308dbdef9b..46d9ede09cb0 100644 --- a/arch/x86/cpu/intel_common/car.S +++ b/arch/x86/cpu/intel_common/car.S @@ -10,7 +10,6 @@ * Copyright (C) 2012 Kyösti Mälkki kyosti.malkki@gmail.com */

-#include <common.h> #include <asm/microcode.h> #include <asm/msr-index.h> #include <asm/mtrr.h> diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c index 8f489e6c651c..e7f419130429 100644 --- a/arch/x86/cpu/intel_common/cpu.c +++ b/arch/x86/cpu/intel_common/cpu.c @@ -7,7 +7,6 @@ * Some code taken from coreboot cpulib.c */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c index 1c0dcedb5824..48b2ef253cbd 100644 --- a/arch/x86/cpu/intel_common/cpu_from_spl.c +++ b/arch/x86/cpu/intel_common/cpu_from_spl.c @@ -3,7 +3,6 @@ * Copyright (c) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <errno.h> #include <handoff.h> diff --git a/arch/x86/cpu/intel_common/fast_spi.c b/arch/x86/cpu/intel_common/fast_spi.c index 5d3944dee2c8..e1d536be2122 100644 --- a/arch/x86/cpu/intel_common/fast_spi.c +++ b/arch/x86/cpu/intel_common/fast_spi.c @@ -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> diff --git a/arch/x86/cpu/intel_common/generic_wifi.c b/arch/x86/cpu/intel_common/generic_wifi.c index 61ec5391b094..75fa4e01d8ad 100644 --- a/arch/x86/cpu/intel_common/generic_wifi.c +++ b/arch/x86/cpu/intel_common/generic_wifi.c @@ -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> diff --git a/arch/x86/cpu/intel_common/intel_opregion.c b/arch/x86/cpu/intel_common/intel_opregion.c index 1eed21d8cdf8..78caff0dc123 100644 --- a/arch/x86/cpu/intel_common/intel_opregion.c +++ b/arch/x86/cpu/intel_common/intel_opregion.c @@ -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> diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c index ec73b3d89312..6d3184f969f9 100644 --- a/arch/x86/cpu/intel_common/itss.c +++ b/arch/x86/cpu/intel_common/itss.c @@ -9,7 +9,6 @@ * Taken from coreboot itss.c */

-#include <common.h> #include <dm.h> #include <dt-structs.h> #include <irq.h> diff --git a/arch/x86/cpu/intel_common/lpc.c b/arch/x86/cpu/intel_common/lpc.c index af68c0f079c4..f2bdf8c1e878 100644 --- a/arch/x86/cpu/intel_common/lpc.c +++ b/arch/x86/cpu/intel_common/lpc.c @@ -3,7 +3,6 @@ * Copyright (c) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/intel_common/lpss.c b/arch/x86/cpu/intel_common/lpss.c index 26a2d2d1e36d..44cd3f0ca5f6 100644 --- a/arch/x86/cpu/intel_common/lpss.c +++ b/arch/x86/cpu/intel_common/lpss.c @@ -7,7 +7,6 @@ * Some code from coreboot lpss.c */

-#include <common.h> #include <dm.h> #include <pci.h> #include <asm/io.h> diff --git a/arch/x86/cpu/intel_common/me_status.c b/arch/x86/cpu/intel_common/me_status.c index abc5f6fbc77b..a09bd5029ebb 100644 --- a/arch/x86/cpu/intel_common/me_status.c +++ b/arch/x86/cpu/intel_common/me_status.c @@ -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>

diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index 4d8e1d210838..6cad2727075c 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -6,7 +6,6 @@ * Microcode update for Intel PIII and later CPUs */

-#include <common.h> #include <errno.h> #include <fdtdec.h> #include <log.h> diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index ff959d1bd8d8..c834c05d1308 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -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> diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c index e4e53f73c08d..7aad8f8ca56a 100644 --- a/arch/x86/cpu/intel_common/p2sb.c +++ b/arch/x86/cpu/intel_common/p2sb.c @@ -7,7 +7,6 @@

#define LOG_CATEGORY UCLASS_P2SB

-#include <common.h> #include <dm.h> #include <dt-structs.h> #include <log.h> diff --git a/arch/x86/cpu/intel_common/pch.c b/arch/x86/cpu/intel_common/pch.c index af82b64a13c7..c4cc478b3064 100644 --- a/arch/x86/cpu/intel_common/pch.c +++ b/arch/x86/cpu/intel_common/pch.c @@ -3,7 +3,6 @@ * Copyright (c) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <asm/pch_common.h>

diff --git a/arch/x86/cpu/intel_common/report_platform.c b/arch/x86/cpu/intel_common/report_platform.c index a3612817c45b..a7524435ba03 100644 --- a/arch/x86/cpu/intel_common/report_platform.c +++ b/arch/x86/cpu/intel_common/report_platform.c @@ -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) { diff --git a/arch/x86/cpu/ioapic.c b/arch/x86/cpu/ioapic.c index 4f99de6ece2b..fa912bac57dd 100644 --- a/arch/x86/cpu/ioapic.c +++ b/arch/x86/cpu/ioapic.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <log.h> #include <asm/io.h> #include <asm/ioapic.h> diff --git a/arch/x86/cpu/irq.c b/arch/x86/cpu/irq.c index 766b2451a2cc..d4dd1816092b 100644 --- a/arch/x86/cpu/irq.c +++ b/arch/x86/cpu/irq.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/bd82x6x.c b/arch/x86/cpu/ivybridge/bd82x6x.c index 417290f559e9..8ae4798f125c 100644 --- a/arch/x86/cpu/ivybridge/bd82x6x.c +++ b/arch/x86/cpu/ivybridge/bd82x6x.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2014 Google, Inc */ -#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c index e71a10bfd441..d71ab0a6385e 100644 --- a/arch/x86/cpu/ivybridge/cpu.c +++ b/arch/x86/cpu/ivybridge/cpu.c @@ -10,7 +10,6 @@ * Copyright (C) 2011 Google Inc. */

-#include <common.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index bee1671baf8b..ac868025f8ed 100644 --- a/arch/x86/cpu/ivybridge/early_me.c +++ b/arch/x86/cpu/ivybridge/early_me.c @@ -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> diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c index 3c4ea6c267f8..19b6ef283bc0 100644 --- a/arch/x86/cpu/ivybridge/fsp_configs.c +++ b/arch/x86/cpu/ivybridge/fsp_configs.c @@ -3,7 +3,6 @@ * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <fdtdec.h> #include <log.h> #include <asm/fsp1/fsp_support.h> diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c index eb3f362e4e99..81b54bb8dda5 100644 --- a/arch/x86/cpu/ivybridge/ivybridge.c +++ b/arch/x86/cpu/ivybridge/ivybridge.c @@ -3,10 +3,10 @@ * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */

-#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) { diff --git a/arch/x86/cpu/ivybridge/lpc.c b/arch/x86/cpu/ivybridge/lpc.c index f931d2be1b52..17a47edadbb8 100644 --- a/arch/x86/cpu/ivybridge/lpc.c +++ b/arch/x86/cpu/ivybridge/lpc.c @@ -5,7 +5,6 @@ * Copyright (C) 2008-2009 coresystems GmbH */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index 3906a69796f3..b72de96a277e 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -6,7 +6,6 @@ * Copyright (C) 2011 The Chromium Authors */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/northbridge.c b/arch/x86/cpu/ivybridge/northbridge.c index 994f8a4ff6a5..76e52f38ad83 100644 --- a/arch/x86/cpu/ivybridge/northbridge.c +++ b/arch/x86/cpu/ivybridge/northbridge.c @@ -6,7 +6,6 @@ * Copyright (C) 2011 The Chromium Authors */

-#include <common.h> #include <dm.h> #include <log.h> #include <asm/global_data.h> diff --git a/arch/x86/cpu/ivybridge/sata.c b/arch/x86/cpu/ivybridge/sata.c index f47ecdffae76..4e2484fa956d 100644 --- a/arch/x86/cpu/ivybridge/sata.c +++ b/arch/x86/cpu/ivybridge/sata.c @@ -4,7 +4,6 @@ * Copyright (C) 2008-2009 coresystems GmbH */

-#include <common.h> #include <ahci.h> #include <dm.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 95a826da7130..bddec6c66b66 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -11,7 +11,6 @@

#define LOG_CATEGORY UCLASS_RAM

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c index 51dfe23f94d0..e7ec35bbe2a6 100644 --- a/arch/x86/cpu/ivybridge/sdram_nop.c +++ b/arch/x86/cpu/ivybridge/sdram_nop.c @@ -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;

diff --git a/arch/x86/cpu/lapic.c b/arch/x86/cpu/lapic.c index c0691454f129..55b1b1833eed 100644 --- a/arch/x86/cpu/lapic.c +++ b/arch/x86/cpu/lapic.c @@ -6,7 +6,6 @@ * Copyright (C) 2014 Google, Inc */

-#include <common.h> #include <log.h> #include <asm/io.h> #include <asm/lapic.h> diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c index a133a5d81161..aa1f47d7227e 100644 --- a/arch/x86/cpu/mp_init.c +++ b/arch/x86/cpu/mp_init.c @@ -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> diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 9c24ae984e90..50cba5fb88dc 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -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> diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 8a992ed82339..a7ad57f6de03 100644 --- a/arch/x86/cpu/pci.c +++ b/arch/x86/cpu/pci.c @@ -8,7 +8,6 @@ * Daniel Engström, Omicron Ceti AB, daniel@omicron.se */

-#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c index 735b6560843a..0708a380626f 100644 --- a/arch/x86/cpu/qemu/cpu.c +++ b/arch/x86/cpu/qemu/cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Miao Yan yanmiaobest@gmail.com */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/cpu/qemu/dram.c b/arch/x86/cpu/qemu/dram.c index d83abf005271..6ac363f3d8c7 100644 --- a/arch/x86/cpu/qemu/dram.c +++ b/arch/x86/cpu/qemu/dram.c @@ -3,11 +3,11 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#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; diff --git a/arch/x86/cpu/qemu/e820.c b/arch/x86/cpu/qemu/e820.c index ebfe5956442a..17a04f86479e 100644 --- a/arch/x86/cpu/qemu/e820.c +++ b/arch/x86/cpu/qemu/e820.c @@ -6,7 +6,6 @@ * (C) Copyright 2019 Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <env_internal.h> #include <malloc.h> #include <asm/e820.h> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 70414556086c..262584d01f0f 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#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;

diff --git a/arch/x86/cpu/qfw_cpu.c b/arch/x86/cpu/qfw_cpu.c index ee00b8fe7327..468df5a36e61 100644 --- a/arch/x86/cpu/qfw_cpu.c +++ b/arch/x86/cpu/qfw_cpu.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <malloc.h> diff --git a/arch/x86/cpu/quark/acpi.c b/arch/x86/cpu/quark/acpi.c index 0e18ceab68d4..80e94600fc5a 100644 --- a/arch/x86/cpu/quark/acpi.c +++ b/arch/x86/cpu/quark/acpi.c @@ -3,13 +3,13 @@ * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */

-#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) diff --git a/arch/x86/cpu/quark/dram.c b/arch/x86/cpu/quark/dram.c index ad98f3e07bae..7d32b98e8daf 100644 --- a/arch/x86/cpu/quark/dram.c +++ b/arch/x86/cpu/quark/dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#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;

diff --git a/arch/x86/cpu/quark/hte.c b/arch/x86/cpu/quark/hte.c index df14779357d5..3cca6bd4c227 100644 --- a/arch/x86/cpu/quark/hte.c +++ b/arch/x86/cpu/quark/hte.c @@ -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" diff --git a/arch/x86/cpu/quark/mrc.c b/arch/x86/cpu/quark/mrc.c index ce3c2b8ab426..be9c36b96c4f 100644 --- a/arch/x86/cpu/quark/mrc.c +++ b/arch/x86/cpu/quark/mrc.c @@ -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"

diff --git a/arch/x86/cpu/quark/mrc_util.c b/arch/x86/cpu/quark/mrc_util.c index b0bc59b71ef5..85408b3e3352 100644 --- a/arch/x86/cpu/quark/mrc_util.c +++ b/arch/x86/cpu/quark/mrc_util.c @@ -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" diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c index d4f8c082ffc2..6261766cdf88 100644 --- a/arch/x86/cpu/quark/msg_port.c +++ b/arch/x86/cpu/quark/msg_port.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <asm/arch/device.h> #include <asm/arch/msg_port.h> #include <asm/arch/quark.h> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index 62b83c228cfb..fdf92b2c0c3a 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#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) diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c index b4b3e1204bd5..a7e92b3f5c16 100644 --- a/arch/x86/cpu/quark/smc.c +++ b/arch/x86/cpu/quark/smc.c @@ -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" diff --git a/arch/x86/cpu/queensbay/fsp_configs.c b/arch/x86/cpu/queensbay/fsp_configs.c index 381edd076158..3b5cbdb44f1a 100644 --- a/arch/x86/cpu/queensbay/fsp_configs.c +++ b/arch/x86/cpu/queensbay/fsp_configs.c @@ -4,7 +4,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <asm/fsp1/fsp_support.h>

void fsp_update_configs(struct fsp_config_data *config, diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c index 4a008622d19e..7c7eb413f993 100644 --- a/arch/x86/cpu/queensbay/tnc.c +++ b/arch/x86/cpu/queensbay/tnc.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <init.h> #include <dm/device-internal.h> diff --git a/arch/x86/cpu/slimbootloader/sdram.c b/arch/x86/cpu/slimbootloader/sdram.c index fbb33b246e5b..75ca5273625c 100644 --- a/arch/x86/cpu/slimbootloader/sdram.c +++ b/arch/x86/cpu/slimbootloader/sdram.c @@ -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> diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c index d28b280890d3..4c889dad6d2d 100644 --- a/arch/x86/cpu/slimbootloader/serial.c +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Intel Corporation <www.intel.com> */

-#include <common.h> #include <dm.h> #include <log.h> #include <ns16550.h> diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c index ec5b87cfd63f..142c9341cf86 100644 --- a/arch/x86/cpu/slimbootloader/slimbootloader.c +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c @@ -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> diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 1d37cc9e2b0d..d4d0ef6f8552 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -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> diff --git a/arch/x86/cpu/tangier/pinmux.c b/arch/x86/cpu/tangier/pinmux.c index 23bfa7c18d2c..6afb8646a987 100644 --- a/arch/x86/cpu/tangier/pinmux.c +++ b/arch/x86/cpu/tangier/pinmux.c @@ -3,7 +3,6 @@ * Copyright (c) 2018 Emlid Limited */

-#include <common.h> #include <dm.h> #include <log.h> #include <dm/pinctrl.h> diff --git a/arch/x86/cpu/tangier/sdram.c b/arch/x86/cpu/tangier/sdram.c index 374b262b1348..7e1d290fc595 100644 --- a/arch/x86/cpu/tangier/sdram.c +++ b/arch/x86/cpu/tangier/sdram.c @@ -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; diff --git a/arch/x86/cpu/tangier/sysreset.c b/arch/x86/cpu/tangier/sysreset.c index b03bc28f9353..f57423a611d2 100644 --- a/arch/x86/cpu/tangier/sysreset.c +++ b/arch/x86/cpu/tangier/sysreset.c @@ -5,7 +5,6 @@ * Reset driver for tangier processor */

-#include <common.h> #include <dm.h> #include <sysreset.h> #include <asm/scu.h> diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index 1e2f6cc8b700..8a8f7d27a9d1 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -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> diff --git a/arch/x86/cpu/turbo.c b/arch/x86/cpu/turbo.c index e2c84cddec8e..c9b402c4dc73 100644 --- a/arch/x86/cpu/turbo.c +++ b/arch/x86/cpu/turbo.c @@ -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> diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 5ea746ecce4d..80eab7103152 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <cpu_func.h> #include <debug_uart.h> #include <init.h> diff --git a/arch/x86/cpu/x86_64/interrupts.c b/arch/x86/cpu/x86_64/interrupts.c index 634f7660c03f..b84ff798814e 100644 --- a/arch/x86/cpu/x86_64/interrupts.c +++ b/arch/x86/cpu/x86_64/interrupts.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <irq_func.h> #include <asm/processor-flags.h>

diff --git a/arch/x86/cpu/x86_64/misc.c b/arch/x86/cpu/x86_64/misc.c index 691b67ff68ab..294511e6ebab 100644 --- a/arch/x86/cpu/x86_64/misc.c +++ b/arch/x86/cpu/x86_64/misc.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <init.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/include/asm/arch-quark/mrc.h b/arch/x86/include/asm/arch-quark/mrc.h index 2353426cd6d2..40c92a549cdf 100644 --- a/arch/x86/include/asm/arch-quark/mrc.h +++ b/arch/x86/include/asm/arch-quark/mrc.h @@ -10,6 +10,8 @@ #ifndef _MRC_H_ #define _MRC_H_

+#include <linux/types.h> + #define MRC_VERSION 0x0111

/* architectural definitions */ diff --git a/arch/x86/include/asm/arch-quark/msg_port.h b/arch/x86/include/asm/arch-quark/msg_port.h index 9527fdad3fd4..98a9360d5435 100644 --- a/arch/x86/include/asm/arch-quark/msg_port.h +++ b/arch/x86/include/asm/arch-quark/msg_port.h @@ -34,6 +34,8 @@

#ifndef __ASSEMBLY__

+#include <linux/types.h> + /** * msg_port_setup - set up the message port control register * diff --git a/arch/x86/include/asm/arch-quark/quark.h b/arch/x86/include/asm/arch-quark/quark.h index feca1983ba89..dec30e2b27f3 100644 --- a/arch/x86/include/asm/arch-quark/quark.h +++ b/arch/x86/include/asm/arch-quark/quark.h @@ -71,6 +71,8 @@

#ifndef __ASSEMBLY__

+#include <linux/types.h> + /* variable range MTRR usage */ enum { MTRR_VAR_ROM, diff --git a/arch/x86/include/asm/cb_sysinfo.h b/arch/x86/include/asm/cb_sysinfo.h index 12fa395ffd28..5864b2700cec 100644 --- a/arch/x86/include/asm/cb_sysinfo.h +++ b/arch/x86/include/asm/cb_sysinfo.h @@ -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 diff --git a/arch/x86/include/asm/coreboot_tables.h b/arch/x86/include/asm/coreboot_tables.h index 0dfb64babb96..c967e6ad0ce5 100644 --- a/arch/x86/include/asm/coreboot_tables.h +++ b/arch/x86/include/asm/coreboot_tables.h @@ -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; diff --git a/arch/x86/include/asm/early_cmos.h b/arch/x86/include/asm/early_cmos.h index 543a9e69f03a..007aeb7c23eb 100644 --- a/arch/x86/include/asm/early_cmos.h +++ b/arch/x86/include/asm/early_cmos.h @@ -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

diff --git a/arch/x86/include/asm/handoff.h b/arch/x86/include/asm/handoff.h index aec49b9b815c..5f6691939eb5 100644 --- a/arch/x86/include/asm/handoff.h +++ b/arch/x86/include/asm/handoff.h @@ -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 * diff --git a/arch/x86/include/asm/me_common.h b/arch/x86/include/asm/me_common.h index 857036831492..aa478594ec92 100644 --- a/arch/x86/include/asm/me_common.h +++ b/arch/x86/include/asm/me_common.h @@ -13,6 +13,7 @@ #define __ASM_ME_COMMON_H

#include <linux/compiler.h> +#include <linux/string.h> #include <linux/types.h> #include <pci.h>

diff --git a/arch/x86/include/asm/mp.h b/arch/x86/include/asm/mp.h index f4c4d6c257c5..7c08f7a1d5c0 100644 --- a/arch/x86/include/asm/mp.h +++ b/arch/x86/include/asm/mp.h @@ -11,6 +11,7 @@ #include <asm/atomic.h> #include <asm/cache.h> #include <linux/bitops.h> +#include <linux/errno.h>

struct udevice;

diff --git a/arch/x86/lib/acpi.c b/arch/x86/lib/acpi.c index 155fffabf080..a73a2539ad35 100644 --- a/arch/x86/lib/acpi.c +++ b/arch/x86/lib/acpi.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <log.h> #include <acpi/acpi_table.h> #include <asm/io.h> diff --git a/arch/x86/lib/acpi_nhlt.c b/arch/x86/lib/acpi_nhlt.c index 08e13fdea67f..880ef31df7d9 100644 --- a/arch/x86/lib/acpi_nhlt.c +++ b/arch/x86/lib/acpi_nhlt.c @@ -7,7 +7,6 @@

#define LOG_CATEGORY LOGC_ACPI

-#include <common.h> #include <binman.h> #include <dm.h> #include <log.h> diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 2c70acbe7b0b..3a1e3318a15b 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.c @@ -3,7 +3,6 @@ * Copyright (C) 2017, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <acpi/acpi_s3.h> #include <acpi/acpi_table.h> #include <asm/acpi.h> diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index a5683132b014..a42a7e6bbd65 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_ACPI

-#include <common.h> #include <bloblist.h> #include <cpu.h> #include <dm.h> diff --git a/arch/x86/lib/acpigen.c b/arch/x86/lib/acpigen.c index ea2ec2a90833..b486f8fb37d6 100644 --- a/arch/x86/lib/acpigen.c +++ b/arch/x86/lib/acpigen.c @@ -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> diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index 8df67db65c39..7b2905dda56c 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -11,7 +11,6 @@ * #defines from the assembly-language output. */

-#include <common.h> #include <asm/global_data.h> #include <linux/kbuild.h>

diff --git a/arch/x86/lib/bdinfo.c b/arch/x86/lib/bdinfo.c index 124058442c55..165e8ab944f0 100644 --- a/arch/x86/lib/bdinfo.c +++ b/arch/x86/lib/bdinfo.c @@ -5,7 +5,6 @@ * Copyright 2021 Google LLC */

-#include <common.h> #include <efi.h> #include <init.h> #include <asm/cpu.h> diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index f146bbd54227..03f7360032c6 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -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> diff --git a/arch/x86/lib/bios_interrupts.c b/arch/x86/lib/bios_interrupts.c index d6b4da7e2502..b2cf1527b1cd 100644 --- a/arch/x86/lib/bios_interrupts.c +++ b/arch/x86/lib/bios_interrupts.c @@ -7,7 +7,6 @@ * Copyright (C) 2007-2009 coresystems GmbH */

-#include <common.h> #include <log.h> #include <asm/pci.h> #include "bios_emul.h" diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 050c420e86b6..2c889bcd33c5 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -7,7 +7,6 @@ * Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl) */

-#include <common.h> #include <bootm.h> #include <bootstage.h> #include <command.h> diff --git a/arch/x86/lib/cmd_boot.c b/arch/x86/lib/cmd_boot.c index 4facbe5f32fb..0444a5f89d3c 100644 --- a/arch/x86/lib/cmd_boot.c +++ b/arch/x86/lib/cmd_boot.c @@ -14,7 +14,6 @@ * Marius Groeger mgroeger@sysgo.de */

-#include <common.h> #include <command.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/arch/x86/lib/coreboot/cb_support.c b/arch/x86/lib/coreboot/cb_support.c index ebb45cdfb5b5..b4d5fa4af327 100644 --- a/arch/x86/lib/coreboot/cb_support.c +++ b/arch/x86/lib/coreboot/cb_support.c @@ -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) diff --git a/arch/x86/lib/coreboot/cb_sysinfo.c b/arch/x86/lib/coreboot/cb_sysinfo.c index f7fd9ea5bcbb..ec997fa49cf2 100644 --- a/arch/x86/lib/coreboot/cb_sysinfo.c +++ b/arch/x86/lib/coreboot/cb_sysinfo.c @@ -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;

diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 05519d851a9d..33fce5d0a5e5 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -3,7 +3,6 @@ * Copyright (C) 2016, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <malloc.h> #include <net.h> #include <vesa.h> diff --git a/arch/x86/lib/div64.c b/arch/x86/lib/div64.c index 2bea205f60f9..57da889ef49b 100644 --- a/arch/x86/lib/div64.c +++ b/arch/x86/lib/div64.c @@ -6,7 +6,7 @@ * Copyright 2014 Google Inc. */

-#include <common.h> +#include <linux/types.h>

union overlay64 { u64 longw; diff --git a/arch/x86/lib/e820.c b/arch/x86/lib/e820.c index 12fcff123805..122b4f7ca01b 100644 --- a/arch/x86/lib/e820.c +++ b/arch/x86/lib/e820.c @@ -3,7 +3,6 @@ * Copyright (C) 2015, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <efi_loader.h> #include <asm/e820.h> #include <asm/global_data.h> diff --git a/arch/x86/lib/early_cmos.c b/arch/x86/lib/early_cmos.c index f7b3bb2a8e19..5635d08718fa 100644 --- a/arch/x86/lib/early_cmos.c +++ b/arch/x86/lib/early_cmos.c @@ -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>

diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 8f2977a80709..c47e6ca47388 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index cc889a688d8a..730721dc1768 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <handoff.h> #include <init.h> #include <log.h> diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 09d5da8c841a..5f7701265a95 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -5,7 +5,6 @@

#define LOG_CATEGORY UCLASS_VIDEO

-#include <common.h> #include <dm.h> #include <init.h> #include <log.h> diff --git a/arch/x86/lib/fsp/fsp_support.c b/arch/x86/lib/fsp/fsp_support.c index fd4d98ef6274..19f9f65b2e41 100644 --- a/arch/x86/lib/fsp/fsp_support.c +++ b/arch/x86/lib/fsp/fsp_support.c @@ -4,7 +4,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <log.h> #include <asm/fsp/fsp_support.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index df18f4767562..ebf655a11439 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <errno.h> #include <init.h> diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c index eee9ce54b1ce..f3a8134a3f2f 100644 --- a/arch/x86/lib/fsp1/fsp_dram.c +++ b/arch/x86/lib/fsp1/fsp_dram.c @@ -3,7 +3,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <init.h> #include <asm/fsp/fsp_support.h> #include <asm/global_data.h> diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c index d84c632f1407..6e311a12d20b 100644 --- a/arch/x86/lib/fsp1/fsp_support.c +++ b/arch/x86/lib/fsp1/fsp_support.c @@ -4,7 +4,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <log.h> #include <asm/fsp1/fsp_support.h> #include <asm/post.h> diff --git a/arch/x86/lib/fsp2/fsp_common.c b/arch/x86/lib/fsp2/fsp_common.c index d802a86967d5..45a274c05123 100644 --- a/arch/x86/lib/fsp2/fsp_common.c +++ b/arch/x86/lib/fsp2/fsp_common.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <init.h> #include <asm/fsp/fsp_support.h>

diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c index a1432239cfc1..83c6d7bcc93f 100644 --- a/arch/x86/lib/fsp2/fsp_dram.c +++ b/arch/x86/lib/fsp2/fsp_dram.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY LOGC_ARCH

-#include <common.h> #include <handoff.h> #include <init.h> #include <log.h> diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c index aadc08cf3c44..ecbadaae75cf 100644 --- a/arch/x86/lib/fsp2/fsp_init.c +++ b/arch/x86/lib/fsp2/fsp_init.c @@ -3,7 +3,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <binman.h> #include <binman_sym.h> #include <bootstage.h> diff --git a/arch/x86/lib/fsp2/fsp_meminit.c b/arch/x86/lib/fsp2/fsp_meminit.c index 022e2cb64e5a..f4817830cc21 100644 --- a/arch/x86/lib/fsp2/fsp_meminit.c +++ b/arch/x86/lib/fsp2/fsp_meminit.c @@ -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> diff --git a/arch/x86/lib/fsp2/fsp_silicon_init.c b/arch/x86/lib/fsp2/fsp_silicon_init.c index a96d2b183f6e..16d30c25a57a 100644 --- a/arch/x86/lib/fsp2/fsp_silicon_init.c +++ b/arch/x86/lib/fsp2/fsp_silicon_init.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_NORTHBRIDGE

-#include <common.h> #include <binman.h> #include <bootstage.h> #include <dm.h> diff --git a/arch/x86/lib/fsp2/fsp_support.c b/arch/x86/lib/fsp2/fsp_support.c index b2c76582453f..808f0eb9d29c 100644 --- a/arch/x86/lib/fsp2/fsp_support.c +++ b/arch/x86/lib/fsp2/fsp_support.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <init.h> #include <log.h> diff --git a/arch/x86/lib/hob.c b/arch/x86/lib/hob.c index b35248e5fde7..46e83aa395ab 100644 --- a/arch/x86/lib/hob.c +++ b/arch/x86/lib/hob.c @@ -4,7 +4,6 @@ * Copyright (C) 2014, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <asm/hob.h>

/** diff --git a/arch/x86/lib/i8254.c b/arch/x86/lib/i8254.c index a8d1db188ece..8a590c6191fa 100644 --- a/arch/x86/lib/i8254.c +++ b/arch/x86/lib/i8254.c @@ -4,10 +4,10 @@ * Daniel Engström, Omicron Ceti AB, daniel@omicron.se */

-#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 diff --git a/arch/x86/lib/i8259.c b/arch/x86/lib/i8259.c index a0e3c0925738..465ff70146f7 100644 --- a/arch/x86/lib/i8259.c +++ b/arch/x86/lib/i8259.c @@ -13,7 +13,6 @@ * Programmable Interrupt Controllers. */

-#include <common.h> #include <log.h> #include <asm/io.h> #include <asm/i8259.h> diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index bf0c921577d1..bd0efde00c10 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -4,11 +4,11 @@ * Graeme Russ, graeme.russ@gmail.com */

-#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;

diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c index ff52959ed285..f96b2bfd70ee 100644 --- a/arch/x86/lib/interrupts.c +++ b/arch/x86/lib/interrupts.c @@ -29,7 +29,6 @@ * Daniel Engström */

-#include <common.h> #include <command.h> #include <irq_func.h> #include <asm/interrupt.h> diff --git a/arch/x86/lib/lpc-uclass.c b/arch/x86/lib/lpc-uclass.c index 67b931d3b289..4f89db4e5389 100644 --- a/arch/x86/lib/lpc-uclass.c +++ b/arch/x86/lib/lpc-uclass.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h>

UCLASS_DRIVER(lpc) = { diff --git a/arch/x86/lib/mpspec.c b/arch/x86/lib/mpspec.c index 8e97d9ff36d9..5abd9288c2a3 100644 --- a/arch/x86/lib/mpspec.c +++ b/arch/x86/lib/mpspec.c @@ -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> diff --git a/arch/x86/lib/mrccache.c b/arch/x86/lib/mrccache.c index 6494b8d26341..970704a8dd62 100644 --- a/arch/x86/lib/mrccache.c +++ b/arch/x86/lib/mrccache.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_RAM

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/lib/northbridge-uclass.c b/arch/x86/lib/northbridge-uclass.c index 383888724841..1d1780535a2a 100644 --- a/arch/x86/lib/northbridge-uclass.c +++ b/arch/x86/lib/northbridge-uclass.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <dm/root.h>

diff --git a/arch/x86/lib/physmem.c b/arch/x86/lib/physmem.c index 382f768149f4..48cd1073c152 100644 --- a/arch/x86/lib/physmem.c +++ b/arch/x86/lib/physmem.c @@ -8,7 +8,6 @@ * Software Foundation. */

-#include <common.h> #include <log.h> #include <physmem.h> #include <asm/cpu.h> diff --git a/arch/x86/lib/pinctrl_ich6.c b/arch/x86/lib/pinctrl_ich6.c index c93f245845de..d4f71c562f85 100644 --- a/arch/x86/lib/pinctrl_ich6.c +++ b/arch/x86/lib/pinctrl_ich6.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 Google, Inc */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/lib/pirq_routing.c b/arch/x86/lib/pirq_routing.c index caeaec9287fe..5178940901c2 100644 --- a/arch/x86/lib/pirq_routing.c +++ b/arch/x86/lib/pirq_routing.c @@ -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> diff --git a/arch/x86/lib/pmu.c b/arch/x86/lib/pmu.c index 083aec8d8dd7..2127257cd431 100644 --- a/arch/x86/lib/pmu.c +++ b/arch/x86/lib/pmu.c @@ -2,7 +2,6 @@ /* * Copyright (c) 2017 Intel Corporation */ -#include <common.h> #include <dm.h> #include <regmap.h> #include <syscon.h> diff --git a/arch/x86/lib/ramtest.c b/arch/x86/lib/ramtest.c index 03385396325d..16cd6e49437c 100644 --- a/arch/x86/lib/ramtest.c +++ b/arch/x86/lib/ramtest.c @@ -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) { diff --git a/arch/x86/lib/reloc_ia32_efi.c b/arch/x86/lib/reloc_ia32_efi.c index d56cd50bd937..17ab54dc2469 100644 --- a/arch/x86/lib/reloc_ia32_efi.c +++ b/arch/x86/lib/reloc_ia32_efi.c @@ -7,7 +7,6 @@ * All rights reserved. */

-#include <common.h> #include <efi.h> #include <elf.h>

diff --git a/arch/x86/lib/reloc_x86_64_efi.c b/arch/x86/lib/reloc_x86_64_efi.c index 2694de711041..c7a21d9393d6 100644 --- a/arch/x86/lib/reloc_x86_64_efi.c +++ b/arch/x86/lib/reloc_x86_64_efi.c @@ -9,7 +9,6 @@ * All rights reserved. */

-#include <common.h> #include <efi.h> #include <elf.h>

diff --git a/arch/x86/lib/relocate.c b/arch/x86/lib/relocate.c index da819b9bdd2c..9ce56062d247 100644 --- a/arch/x86/lib/relocate.c +++ b/arch/x86/lib/relocate.c @@ -14,7 +14,6 @@ * Marius Groeger mgroeger@sysgo.de */

-#include <common.h> #include <log.h> #include <relocate.h> #include <asm/global_data.h> diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c index 90ef239bcd3d..02fed601fb65 100644 --- a/arch/x86/lib/scu.c +++ b/arch/x86/lib/scu.c @@ -9,7 +9,6 @@ * * This driver enables IPC channel to SCU. */ -#include <common.h> #include <dm.h> #include <regmap.h> #include <syscon.h> diff --git a/arch/x86/lib/sfi.c b/arch/x86/lib/sfi.c index 85e963b634b5..04d97327a4df 100644 --- a/arch/x86/lib/sfi.c +++ b/arch/x86/lib/sfi.c @@ -12,7 +12,6 @@ * See https://simplefirmware.org/ for details */

-#include <common.h> #include <cpu.h> #include <dm.h> #include <asm/cpu.h> diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index c15f11f8cdf4..f761fbc8bc3b 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -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; diff --git a/arch/x86/lib/tables.c b/arch/x86/lib/tables.c index 1095dc92c5aa..45a70e927634 100644 --- a/arch/x86/lib/tables.c +++ b/arch/x86/lib/tables.c @@ -5,7 +5,6 @@

#define LOG_CATEGORY LOGC_ACPI

-#include <common.h> #include <bloblist.h> #include <log.h> #include <malloc.h> diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index 273e9c8e1ca1..7c03dea07111 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -5,7 +5,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <debug_uart.h> #include <dm.h> #include <hang.h> diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index d7403876c13d..73a21bc8f03b 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -14,7 +14,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <bootm.h> #include <command.h> #include <env.h> diff --git a/include/acpi/acpi_s3.h b/include/acpi/acpi_s3.h index d3f271f948ea..f7bea9418552 100644 --- a/include/acpi/acpi_s3.h +++ b/include/acpi/acpi_s3.h @@ -37,6 +37,9 @@

#ifndef __ASSEMBLY__

+#include <linux/errno.h> +#include <linux/types.h> + extern char __wakeup[]; extern int __wakeup_size;

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

Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)

diff --git a/include/adc.h b/include/adc.h index 0d1a666908f2..15e4cdb7dce7 100644 --- a/include/adc.h +++ b/include/adc.h @@ -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)

diff --git a/include/audio_codec.h b/include/audio_codec.h index a81a31515765..a87b76c6f9ed 100644 --- a/include/audio_codec.h +++ b/include/audio_codec.h @@ -7,6 +7,8 @@ #ifndef __AUDIO_CODEC_H__ #define __AUDIO_CODEC_H__

+#include <linux/types.h> + struct udevice;

/* diff --git a/include/axi.h b/include/axi.h index 59fb0b2e4584..133a06ee2719 100644 --- a/include/axi.h +++ b/include/axi.h @@ -7,6 +7,8 @@ #ifndef _AXI_H_ #define _AXI_H_

+#include <linux/types.h> + struct udevice;

/** diff --git a/include/bootmeth.h b/include/bootmeth.h index 0fc36104ece0..cd9517321c0a 100644 --- a/include/bootmeth.h +++ b/include/bootmeth.h @@ -7,6 +7,8 @@ #ifndef __bootmeth_h #define __bootmeth_h

+#include <linux/bitops.h> + struct blk_desc; struct bootflow; struct bootflow_iter; diff --git a/include/bootstd.h b/include/bootstd.h index 99ce7b64e7c5..ac756e98d84a 100644 --- a/include/bootstd.h +++ b/include/bootstd.h @@ -10,6 +10,8 @@ #define __bootstd_h

#include <dm/ofnode_decl.h> +#include <linux/list.h> +#include <linux/types.h>

struct udevice;

diff --git a/include/cedit.h b/include/cedit.h index f43cafa5aa24..a31b42452477 100644 --- a/include/cedit.h +++ b/include/cedit.h @@ -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 */ diff --git a/include/dm/test.h b/include/dm/test.h index b5937509212b..02737411a164 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -6,6 +6,8 @@ #ifndef __DM_TEST_H #define __DM_TEST_H

+#include <linux/types.h> + struct udevice;

/** diff --git a/test/bloblist.c b/test/bloblist.c index 1c60bbac36c3..7c63682908a5 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -3,7 +3,6 @@ * Copyright (c) 2018, Google Inc. All rights reserved. */

-#include <common.h> #include <bloblist.h> #include <log.h> #include <mapmem.h> diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c index 0702fccdae60..6e940002f848 100644 --- a/test/boot/bootdev.c +++ b/test/boot/bootdev.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootstd.h> #include <dm.h> #include <bootdev.h> diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 674d4c05f83f..4511cfa7f9bf 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/test/boot/bootmeth.c b/test/boot/bootmeth.c index e498eee036eb..113b789ea793 100644 --- a/test/boot/bootmeth.c +++ b/test/boot/bootmeth.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootmeth.h> #include <bootstd.h> #include <dm.h> diff --git a/test/boot/bootstd_common.c b/test/boot/bootstd_common.c index cc97e255e5cb..e50539500a02 100644 --- a/test/boot/bootstd_common.c +++ b/test/boot/bootstd_common.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootdev.h> #include <bootstd.h> #include <dm.h> diff --git a/test/boot/cedit.c b/test/boot/cedit.c index aa4171904864..fd19da0a0c0f 100644 --- a/test/boot/cedit.c +++ b/test/boot/cedit.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <cedit.h> #include <env.h> #include <expo.h> diff --git a/test/boot/expo.c b/test/boot/expo.c index 714fdfa415d1..6ea0184373d5 100644 --- a/test/boot/expo.c +++ b/test/boot/expo.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <command.h> #include <dm.h> #include <expo.h> diff --git a/test/boot/image.c b/test/boot/image.c index 2844b057859e..0894e30587f1 100644 --- a/test/boot/image.c +++ b/test/boot/image.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <image.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/boot/measurement.c b/test/boot/measurement.c index 9db2ed324c2a..29be495412d3 100644 --- a/test/boot/measurement.c +++ b/test/boot/measurement.c @@ -6,7 +6,6 @@ * Written by Eddie James eajames@linux.ibm.com */

-#include <common.h> #include <bootm.h> #include <malloc.h> #include <test/suites.h> diff --git a/test/boot/vbe_fixup.c b/test/boot/vbe_fixup.c index eba5c4ebe6c0..540816e42b00 100644 --- a/test/boot/vbe_fixup.c +++ b/test/boot/vbe_fixup.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm/ofnode.h> #include <linux/libfdt.h> #include <test/test.h> diff --git a/test/boot/vbe_simple.c b/test/boot/vbe_simple.c index 5e61840652cf..3672b744e5fb 100644 --- a/test/boot/vbe_simple.c +++ b/test/boot/vbe_simple.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootmeth.h> #include <dm.h> #include <image.h> diff --git a/test/bootm.c b/test/bootm.c index 4bb3ca0655cf..26c15552bf63 100644 --- a/test/bootm.c +++ b/test/bootm.c @@ -5,7 +5,6 @@ * Copyright 2020 Google LLC */

-#include <common.h> #include <bootm.h> #include <asm/global_data.h> #include <test/suites.h> diff --git a/test/cmd/addrmap.c b/test/cmd/addrmap.c index 1eb5955db172..7b8f49fd3751 100644 --- a/test/cmd/addrmap.c +++ b/test/cmd/addrmap.c @@ -5,7 +5,6 @@ * Copyright (C) 2021, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <console.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/cmd/armffa.c b/test/cmd/armffa.c index 9a44a397e8a0..38f40b72f5e4 100644 --- a/test/cmd/armffa.c +++ b/test/cmd/armffa.c @@ -8,7 +8,6 @@ * Abdellatif El Khlifi abdellatif.elkhlifi@arm.com */

-#include <common.h> #include <string.h> #include <asm/sandbox_arm_ffa.h> #include <dm/test.h> diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 4977d01f62d6..027848c3e24c 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -5,7 +5,6 @@ * Copyright 2023 Marek Vasut marek.vasut+renesas@mailbox.org */

-#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/exit.c b/test/cmd/exit.c index 7e160f7e4bb7..d310ec8531be 100644 --- a/test/cmd/exit.c +++ b/test/cmd/exit.c @@ -5,7 +5,6 @@ * Copyright 2022 Marek Vasut marex@denx.de */

-#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/fdt.c b/test/cmd/fdt.c index 547085521758..a0faf5aca904 100644 --- a/test/cmd/fdt.c +++ b/test/cmd/fdt.c @@ -5,7 +5,6 @@ * Copyright 2022 Google LLC */

-#include <common.h> #include <console.h> #include <fdt_support.h> #include <mapmem.h> diff --git a/test/cmd/font.c b/test/cmd/font.c index 1fe05c1ead51..a8905ce617e8 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -5,7 +5,6 @@ * Copyright 2022 Google LLC */

-#include <common.h> #include <console.h> #include <dm.h> #include <video_console.h> diff --git a/test/cmd/history.c b/test/cmd/history.c index 06517fcdbb51..6964bfa9e1ec 100644 --- a/test/cmd/history.c +++ b/test/cmd/history.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <cli.h> #include <command.h> #include <test/lib.h> diff --git a/test/cmd/loadm.c b/test/cmd/loadm.c index 41e005ac5923..dff8a97d1396 100644 --- a/test/cmd/loadm.c +++ b/test/cmd/loadm.c @@ -9,7 +9,6 @@ * Rui Miguel Silva rui.silva@linaro.org */

-#include <common.h> #include <console.h> #include <mapmem.h> #include <asm/global_data.h> diff --git a/test/cmd/mem.c b/test/cmd/mem.c index d76f47cf3115..f1bbab6055be 100644 --- a/test/cmd/mem.c +++ b/test/cmd/mem.c @@ -5,7 +5,6 @@ * Copyright 2020 Google LLC */

-#include <common.h> #include <command.h> #include <test/suites.h> #include <test/test.h> diff --git a/test/cmd/mem_search.c b/test/cmd/mem_search.c index f80c9c406873..55ad2fac1e34 100644 --- a/test/cmd/mem_search.c +++ b/test/cmd/mem_search.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <console.h> #include <mapmem.h> #include <dm/test.h> diff --git a/test/cmd/pci_mps.c b/test/cmd/pci_mps.c index fd96f4fba6c4..2a64143eecd3 100644 --- a/test/cmd/pci_mps.c +++ b/test/cmd/pci_mps.c @@ -7,7 +7,6 @@ * Written by Stephen Carlson stcarlso@linux.microsoft.com */

-#include <common.h> #include <console.h> #include <test/suites.h> #include <test/ut.h> diff --git a/test/cmd/pinmux.c b/test/cmd/pinmux.c index df40bb774355..4253baa56466 100644 --- a/test/cmd/pinmux.c +++ b/test/cmd/pinmux.c @@ -5,7 +5,6 @@ * Copyright (C) 2021, STMicroelectronics - All Rights Reserved */

-#include <common.h> #include <command.h> #include <dm.h> #include <dm/test.h> diff --git a/test/cmd/rw.c b/test/cmd/rw.c index 98302bf047b1..edd762e4d58f 100644 --- a/test/cmd/rw.c +++ b/test/cmd/rw.c @@ -3,7 +3,6 @@ * Tests for read and write commands */

-#include <common.h> #include <dm/test.h> #include <mapmem.h> #include <part.h> diff --git a/test/cmd/seama.c b/test/cmd/seama.c index b1b56930c646..b60f6550b13c 100644 --- a/test/cmd/seama.c +++ b/test/cmd/seama.c @@ -5,7 +5,6 @@ * Copyright (C) 2021 Linus Walleij linus.walleij@linaro.org */

-#include <common.h> #include <command.h> #include <dm.h> #include <test/suites.h> diff --git a/test/cmd/setexpr.c b/test/cmd/setexpr.c index ee329e94b85b..d50ce5803c39 100644 --- a/test/cmd/setexpr.c +++ b/test/cmd/setexpr.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <console.h> #include <mapmem.h> #include <dm/test.h> diff --git a/test/cmd/temperature.c b/test/cmd/temperature.c index 2a1ea0611dc4..364972626b1f 100644 --- a/test/cmd/temperature.c +++ b/test/cmd/temperature.c @@ -5,7 +5,6 @@ * Copyright (C) 2022 Sartura Ltd. */

-#include <common.h> #include <command.h> #include <dm.h> #include <dm/test.h> diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c index 091e4f823c90..cde74ebeb616 100644 --- a/test/cmd/test_echo.c +++ b/test/cmd/test_echo.c @@ -5,7 +5,6 @@ * Copyright 2020, Heinrich Schuchadt xypron.glpk@gmx.de */

-#include <common.h> #include <command.h> #include <asm/global_data.h> #include <display_options.h> diff --git a/test/cmd/test_pause.c b/test/cmd/test_pause.c index 2b85cce32710..3703290350b3 100644 --- a/test/cmd/test_pause.c +++ b/test/cmd/test_pause.c @@ -5,7 +5,6 @@ * Copyright 2022, Samuel Dionne-Riel samuel@dionne-riel.com */

-#include <common.h> #include <asm/global_data.h> #include <test/lib.h> #include <test/ut.h> diff --git a/test/cmd/wget.c b/test/cmd/wget.c index ed83fc94a5e2..356a4dcd8fad 100644 --- a/test/cmd/wget.c +++ b/test/cmd/wget.c @@ -6,7 +6,6 @@ * Ying-Chun Liu (PaulLiu) paul.liu@linaro.org */

-#include <common.h> #include <command.h> #include <dm.h> #include <env.h> diff --git a/test/cmd_ut.c b/test/cmd_ut.c index 0677ce0cd174..4e4aa8f1cb27 100644 --- a/test/cmd_ut.c +++ b/test/cmd_ut.c @@ -4,9 +4,9 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */

-#include <common.h> #include <command.h> #include <console.h> +#include <vsprintf.h> #include <test/suites.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/command_ut.c b/test/command_ut.c index a74bd109e153..2b8d28d7ae32 100644 --- a/test/command_ut.c +++ b/test/command_ut.c @@ -5,7 +5,6 @@

#define DEBUG

-#include <common.h> #include <command.h> #include <env.h> #include <log.h> diff --git a/test/common/cmd_ut_common.c b/test/common/cmd_ut_common.c index 2c0267801b23..2f03a58af47c 100644 --- a/test/common/cmd_ut_common.c +++ b/test/common/cmd_ut_common.c @@ -6,7 +6,6 @@ * Unit tests for common functions */

-#include <common.h> #include <command.h> #include <test/common.h> #include <test/suites.h> diff --git a/test/common/cread.c b/test/common/cread.c index 4edc77396043..e159caed0419 100644 --- a/test/common/cread.c +++ b/test/common/cread.c @@ -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> diff --git a/test/common/cyclic.c b/test/common/cyclic.c index 6e758e89dbdb..461f8cf91f45 100644 --- a/test/common/cyclic.c +++ b/test/common/cyclic.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 Stefan Roese sr@denx.de */

-#include <common.h> #include <cyclic.h> #include <dm.h> #include <test/common.h> diff --git a/test/common/event.c b/test/common/event.c index b462694fc3b6..de433d34f22b 100644 --- a/test/common/event.c +++ b/test/common/event.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <event.h> #include <test/common.h> diff --git a/test/common/test_autoboot.c b/test/common/test_autoboot.c index 42a1e4ab1fa0..4ba1dcc8091c 100644 --- a/test/common/test_autoboot.c +++ b/test/common/test_autoboot.c @@ -6,7 +6,6 @@ */

#include <autoboot.h> -#include <common.h> #include <test/common.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/compression.c b/test/compression.c index 3df90819a1fb..aa1d38bb7bc5 100644 --- a/test/compression.c +++ b/test/compression.c @@ -3,7 +3,6 @@ * Copyright (c) 2013, The Chromium Authors */

-#include <common.h> #include <abuf.h> #include <bootm.h> #include <command.h> diff --git a/test/dm/acpi.c b/test/dm/acpi.c index f14b3962f845..4db2171a4b17 100644 --- a/test/dm/acpi.c +++ b/test/dm/acpi.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <console.h> #include <dm.h> #include <malloc.h> diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c index 44bcabda6bc1..87bd8ae6749b 100644 --- a/test/dm/acpi_dp.c +++ b/test/dm/acpi_dp.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <uuid.h> #include <acpi/acpigen.h> diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c index 15b2b6f64a03..7113219792e6 100644 --- a/test/dm/acpigen.c +++ b/test/dm/acpigen.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <irq.h> #include <malloc.h> diff --git a/test/dm/adc.c b/test/dm/adc.c index 740167e16b8e..a26a677074a4 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -6,7 +6,6 @@ * Przemyslaw Marczak p.marczak@samsung.com */

-#include <common.h> #include <adc.h> #include <dm.h> #include <dm/root.h> diff --git a/test/dm/audio.c b/test/dm/audio.c index add15ae20e00..3d1d821f3234 100644 --- a/test/dm/audio.c +++ b/test/dm/audio.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <audio_codec.h> #include <dm.h> #include <dm/test.h> diff --git a/test/dm/axi.c b/test/dm/axi.c index dc029df5e443..0900a9b5485e 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <axi.h> #include <dm.h> #include <log.h> diff --git a/test/dm/blk.c b/test/dm/blk.c index 799f1e4dc75b..d03aec32f6c7 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <blk.h> #include <dm.h> #include <part.h> diff --git a/test/dm/blkmap.c b/test/dm/blkmap.c index 7a163d6eaef2..7581e62df3bb 100644 --- a/test/dm/blkmap.c +++ b/test/dm/blkmap.c @@ -4,7 +4,6 @@ * Author: Tobias Waldekranz tobias@waldekranz.com */

-#include <common.h> #include <blk.h> #include <blkmap.h> #include <dm.h> diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index b77b472d1f26..9cfc7d48aac0 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -3,7 +3,6 @@ * (C) 2018 Theobroma Systems Design und Consulting GmbH */

-#include <common.h> #include <dm.h> #include <bootcount.h> #include <log.h> diff --git a/test/dm/bus.c b/test/dm/bus.c index 89a6aa6554cb..a338c7f567c1 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -3,7 +3,6 @@ * Copyright (c) 2014 Google, Inc */

-#include <common.h> #ifdef CONFIG_SANDBOX #include <log.h> #include <os.h> diff --git a/test/dm/button.c b/test/dm/button.c index 830d96fbef34..9157ec928783 100644 --- a/test/dm/button.c +++ b/test/dm/button.c @@ -5,7 +5,6 @@ * Based on led.c */

-#include <common.h> #include <dm.h> #include <adc.h> #include <button.h> diff --git a/test/dm/cache.c b/test/dm/cache.c index bbd8f98d007b..d2f3bfe2caf3 100644 --- a/test/dm/cache.c +++ b/test/dm/cache.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Intel Corporation <www.intel.com> */

-#include <common.h> #include <dm.h> #include <dm/test.h>

diff --git a/test/dm/clk.c b/test/dm/clk.c index 57fabbdce08b..a966471dbd96 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index 61dad8d85273..15fba31b962f 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -4,7 +4,6 @@ * Lukasz Majewski, DENX Software Engineering, lukma@denx.de */

-#include <common.h> #include <clk.h> #include <dm.h> #include <asm/clk.h> diff --git a/test/dm/core.c b/test/dm/core.c index 7f3f8d183bca..4741c81bcc1d 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -5,7 +5,6 @@ * Copyright (c) 2013 Google, Inc */

-#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/cpu.c b/test/dm/cpu.c index 5734cd0a92d3..acba81059966 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <dm.h> #include <log.h> #include <dm/test.h> diff --git a/test/dm/cros_ec.c b/test/dm/cros_ec.c index 30cb70e08826..ac0055f0acd6 100644 --- a/test/dm/cros_ec.c +++ b/test/dm/cros_ec.c @@ -3,7 +3,6 @@ * Copyright 2021 Google LLC */

-#include <common.h> #include <cros_ec.h> #include <dm.h> #include <asm/test.h> diff --git a/test/dm/cros_ec_pwm.c b/test/dm/cros_ec_pwm.c index f8d6e1e6c40f..f68ee6f33b8c 100644 --- a/test/dm/cros_ec_pwm.c +++ b/test/dm/cros_ec_pwm.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+

-#include <common.h> #include <cros_ec.h> #include <dm.h> #include <pwm.h> diff --git a/test/dm/devres.c b/test/dm/devres.c index 3df0f64362dc..95a470b9f1c1 100644 --- a/test/dm/devres.c +++ b/test/dm/devres.c @@ -5,7 +5,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <errno.h> #include <dm.h> #include <log.h> diff --git a/test/dm/dma.c b/test/dm/dma.c index cce47cb21803..949710fdb4e3 100644 --- a/test/dm/dma.c +++ b/test/dm/dma.c @@ -6,7 +6,6 @@ * Grygorii Strashko grygorii.strashko@ti.com */

-#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index 6e0a5df704f5..68686a40d9f9 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -4,7 +4,6 @@ * Author(s): Yannick Fertre yannick.fertre@st.com for STMicroelectronics. */

-#include <common.h> #include <dm.h> #include <dsi_host.h> #include <asm/state.h> diff --git a/test/dm/efi_media.c b/test/dm/efi_media.c index e343a0e9c85d..9d0ed0f07551 100644 --- a/test/dm/efi_media.c +++ b/test/dm/efi_media.c @@ -5,7 +5,6 @@ * Copyright 2021 Google LLC */

-#include <common.h> #include <dm.h> #include <asm/test.h> #include <dm/test.h> diff --git a/test/dm/eth.c b/test/dm/eth.c index bb3dcc6b9540..820b8cbfc29d 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -6,7 +6,6 @@ * Joe Hershberger joe.hershberger@ni.com */

-#include <common.h> #include <dm.h> #include <env.h> #include <fdtdec.h> diff --git a/test/dm/fastboot.c b/test/dm/fastboot.c index 758538d0e85e..5d938eb7f121 100644 --- a/test/dm/fastboot.c +++ b/test/dm/fastboot.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <fastboot.h> #include <fb_mmc.h> diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c index 087d4846da89..b484414f5f07 100644 --- a/test/dm/fdtdec.c +++ b/test/dm/fdtdec.c @@ -3,7 +3,6 @@ * Copyright 2020 NXP */

-#include <common.h> #include <dm.h> #include <asm/global_data.h> #include <dm/of_extra.h> diff --git a/test/dm/ffa.c b/test/dm/ffa.c index 6912666bb465..fa6d54d00d61 100644 --- a/test/dm/ffa.c +++ b/test/dm/ffa.c @@ -8,7 +8,6 @@ * Abdellatif El Khlifi abdellatif.elkhlifi@arm.com */

-#include <common.h> #include <console.h> #include <dm.h> #include <asm/sandbox_arm_ffa.h> diff --git a/test/dm/firmware.c b/test/dm/firmware.c index f37bccfe4a83..ec68e816999d 100644 --- a/test/dm/firmware.c +++ b/test/dm/firmware.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Xilinx, Inc. */

-#include <common.h> #include <dm.h> #include <syscon.h> #include <asm/test.h> diff --git a/test/dm/fwu_mdata.c b/test/dm/fwu_mdata.c index 52018f610fe4..43ce3d0a9d87 100644 --- a/test/dm/fwu_mdata.c +++ b/test/dm/fwu_mdata.c @@ -5,7 +5,6 @@ */

#include <blk.h> -#include <common.h> #include <dm.h> #include <fwu.h> #include <fwu_mdata.h> diff --git a/test/dm/gpio.c b/test/dm/gpio.c index 0d88ec24bda2..957ab25c8d34 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -3,7 +3,6 @@ * Copyright (C) 2013 Google, Inc */

-#include <common.h> #include <fdtdec.h> #include <dm.h> #include <log.h> diff --git a/test/dm/host.c b/test/dm/host.c index ca05a36b3136..e514f8409cf6 100644 --- a/test/dm/host.c +++ b/test/dm/host.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <blk.h> #include <dm.h> #include <fs.h> diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index 995759d4d7e2..a05b183b8bc1 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved */

-#include <common.h> #include <dm.h> #include <hwspinlock.h> #include <asm/state.h> diff --git a/test/dm/i2c.c b/test/dm/i2c.c index b46a22e79b14..e9cf9f7819a7 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -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> diff --git a/test/dm/i2s.c b/test/dm/i2s.c index c2bf4d5604b9..a3d3a31b6fbc 100644 --- a/test/dm/i2s.c +++ b/test/dm/i2s.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <i2s.h> #include <asm/test.h> diff --git a/test/dm/iommu.c b/test/dm/iommu.c index 62d38f1214ac..acea5f289715 100644 --- a/test/dm/iommu.c +++ b/test/dm/iommu.c @@ -3,7 +3,6 @@ * Copyright (C) 2021 Mark Kettenis kettenis@openbsd.org */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/uclass-internal.h> diff --git a/test/dm/irq.c b/test/dm/irq.c index 51dd5e4abb41..d22772ab7693 100644 --- a/test/dm/irq.c +++ b/test/dm/irq.c @@ -5,7 +5,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <dm.h> #include <irq.h> #include <acpi/acpi_device.h> diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c index 354720f61e2f..2a581499634d 100644 --- a/test/dm/k210_pll.c +++ b/test/dm/k210_pll.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson seanga2@gmail.com */

-#include <common.h> /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */ #include <div64.h> #include <dm/test.h> diff --git a/test/dm/led.c b/test/dm/led.c index eed3f4654c56..c28fa044f459 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <led.h> #include <asm/gpio.h> diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index 7ad8a1cbba28..14f72d58d1cf 100644 --- a/test/dm/mailbox.c +++ b/test/dm/mailbox.c @@ -3,7 +3,6 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */

-#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/mdio.c b/test/dm/mdio.c index f863c52645b2..7ececf37ccc0 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -4,7 +4,6 @@ * Alex Marginean, NXP */

-#include <common.h> #include <dm.h> #include <log.h> #include <miiphy.h> diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index bfe3518221f4..33a7e9726094 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -4,7 +4,6 @@ * Alex Marginean, NXP */

-#include <common.h> #include <dm.h> #include <miiphy.h> #include <misc.h> diff --git a/test/dm/misc.c b/test/dm/misc.c index 8bdd8c64bca2..ad856fd01b6d 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <misc.h> diff --git a/test/dm/mmc.c b/test/dm/mmc.c index b1eb8bee2f9d..c0abea797d9d 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <mmc.h> #include <part.h> diff --git a/test/dm/mux-cmd.c b/test/dm/mux-cmd.c index 11c237b5da90..d4bb8befa384 100644 --- a/test/dm/mux-cmd.c +++ b/test/dm/mux-cmd.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Texas Instruments Inc. * Pratyush Yadav p.yadav@ti.com */ -#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

diff --git a/test/dm/mux-emul.c b/test/dm/mux-emul.c index c6aeeb7e1f1b..febd521104af 100644 --- a/test/dm/mux-emul.c +++ b/test/dm/mux-emul.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/ * Pratyush Yadav p.yadav@ti.com */ -#include <common.h> #include <dm.h> #include <mux.h> #include <mux-internal.h> diff --git a/test/dm/mux-mmio.c b/test/dm/mux-mmio.c index 27c881dabde2..3a871a19c7e2 100644 --- a/test/dm/mux-mmio.c +++ b/test/dm/mux-mmio.c @@ -4,7 +4,6 @@ * Jean-Jacques Hiblot jjhiblot@ti.com */

-#include <common.h> #include <dm.h> #include <mux.h> #include <regmap.h> diff --git a/test/dm/nop.c b/test/dm/nop.c index f7d9a0f3df35..0c79431d9d80 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -6,7 +6,6 @@ * Jean-Jacques Hiblot jjhiblot@ti.com */

-#include <common.h> #include <dm.h> #include <dm/ofnode.h> #include <dm/lists.h> diff --git a/test/dm/nvmxip.c b/test/dm/nvmxip.c index f0ad47d4efe9..537959a0930c 100644 --- a/test/dm/nvmxip.c +++ b/test/dm/nvmxip.c @@ -8,7 +8,6 @@ * Abdellatif El Khlifi abdellatif.elkhlifi@arm.com */

-#include <common.h> #include <blk.h> #include <console.h> #include <dm.h> diff --git a/test/dm/of_extra.c b/test/dm/of_extra.c index ac2d886892d9..3c31bfcd31f9 100644 --- a/test/dm/of_extra.c +++ b/test/dm/of_extra.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <dm/of_extra.h> #include <dm/test.h> diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c index a241c4279367..d4939e885162 100644 --- a/test/dm/of_platdata.c +++ b/test/dm/of_platdata.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+

-#include <common.h> #include <clk.h> #include <dm.h> #include <dt-structs.h> diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index a5bc43aea4e7..39191d7f52b5 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -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> diff --git a/test/dm/ofread.c b/test/dm/ofread.c index 3523860d2b31..69d03c491073 100644 --- a/test/dm/ofread.c +++ b/test/dm/ofread.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <test/ut.h> diff --git a/test/dm/osd.c b/test/dm/osd.c index 6279b391ca5e..cf4a3a545ed0 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <display_options.h> #include <dm.h> #include <video_osd.h> diff --git a/test/dm/p2sb.c b/test/dm/p2sb.c index df24709141ad..3ada1fcb3629 100644 --- a/test/dm/p2sb.c +++ b/test/dm/p2sb.c @@ -5,7 +5,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <dm.h> #include <p2sb.h> #include <asm/test.h> diff --git a/test/dm/panel.c b/test/dm/panel.c index 4d435a0d255c..8be7c397a462 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <backlight.h> #include <dm.h> #include <panel.h> diff --git a/test/dm/part.c b/test/dm/part.c index d6e434581274..cabb31d18ca0 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson sean.anderson@seco.com */

-#include <common.h> #include <dm.h> #include <mmc.h> #include <part.h> diff --git a/test/dm/pch.c b/test/dm/pch.c index 53f7bbf180c9..b37b856d5dac 100644 --- a/test/dm/pch.c +++ b/test/dm/pch.c @@ -3,7 +3,6 @@ * Copyright 2018 Google LLC */

-#include <common.h> #include <dm.h> #include <pch.h> #include <asm/test.h> diff --git a/test/dm/pci.c b/test/dm/pci.c index 8c5e7da9e629..9b97f2e0544f 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <asm/io.h> #include <asm/test.h> diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index 9941abd4cebc..e82fc53f84b1 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -3,7 +3,6 @@ * Copyright (C) 2019 Ramon Fried */

-#include <common.h> #include <dm.h> #include <hexdump.h> #include <pci_ep.h> diff --git a/test/dm/phy.c b/test/dm/phy.c index 0cf3689fdecb..d14117f6f7a9 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -4,7 +4,6 @@ * Written by Jean-Jacques Hiblot jjhiblot@ti.com */

-#include <common.h> #include <dm.h> #include <generic-phy.h> #include <log.h> diff --git a/test/dm/phys2bus.c b/test/dm/phys2bus.c index 342f2fa8ebaa..1ee2150482c6 100644 --- a/test/dm/phys2bus.c +++ b/test/dm/phys2bus.c @@ -3,7 +3,6 @@ * Copyright (c) 2020 Nicolas Saenz Julienne nsaenzjulienne@suse.de */

-#include <common.h> #include <dm.h> #include <mapmem.h> #include <phys2bus.h> diff --git a/test/dm/pinmux.c b/test/dm/pinmux.c index 6880b2d2cd9c..cfbe3ef5d1eb 100644 --- a/test/dm/pinmux.c +++ b/test/dm/pinmux.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <dm/pinctrl.h> #include <dm/test.h> diff --git a/test/dm/pmc.c b/test/dm/pmc.c index e70227e7800b..bbad1ee27419 100644 --- a/test/dm/pmc.c +++ b/test/dm/pmc.c @@ -5,7 +5,6 @@ * Copyright 2019 Google LLC */

-#include <common.h> #include <dm.h> #include <power/acpi_pmc.h> #include <dm/test.h> diff --git a/test/dm/pmic.c b/test/dm/pmic.c index ce671202fbc6..53a6f0369e87 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -6,7 +6,6 @@ * Przemyslaw Marczak p.marczak@samsung.com */

-#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 8604b5d72dc0..120a9059c8e6 100644 --- a/test/dm/power-domain.c +++ b/test/dm/power-domain.c @@ -3,7 +3,6 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */

-#include <common.h> #include <dm.h> #include <malloc.h> #include <dm/test.h> diff --git a/test/dm/pwm.c b/test/dm/pwm.c index dff626c771ac..80133347ec73 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 Google, Inc */

-#include <common.h> #include <dm.h> #include <pwm.h> #include <asm/test.h> diff --git a/test/dm/qfw.c b/test/dm/qfw.c index f3f356898308..3c354163ef3b 100644 --- a/test/dm/qfw.c +++ b/test/dm/qfw.c @@ -3,7 +3,6 @@ * Copyright 2021 Asherah Connor ashe@kivikakk.ee */

-#include <common.h> #include <qfw.h> #include <dm.h> #include <asm/test.h> diff --git a/test/dm/ram.c b/test/dm/ram.c index f624343138d6..188c7c327584 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <ram.h> #include <asm/global_data.h> diff --git a/test/dm/read.c b/test/dm/read.c index 7768aa296885..4ecf18110d0f 100644 --- a/test/dm/read.c +++ b/test/dm/read.c @@ -3,7 +3,6 @@ * Copyright (c) 2020 Nicolas Saenz Julienne nsaenzjulienne@suse.de */

-#include <common.h> #include <dm.h> #include <dm/device.h> #include <dm/ofnode.h> diff --git a/test/dm/reboot-mode.c b/test/dm/reboot-mode.c index fbb9c3a5426a..160b4da07f20 100644 --- a/test/dm/reboot-mode.c +++ b/test/dm/reboot-mode.c @@ -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> diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 8560f2afc2d1..1398f8f6573e 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -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> diff --git a/test/dm/regulator.c b/test/dm/regulator.c index 86f4862d9dd0..9e45fd177b94 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -6,7 +6,6 @@ * Przemyslaw Marczak p.marczak@samsung.com */

-#include <common.h> #include <errno.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index f6f9e509e27a..ef9e8e5a0df6 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -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> diff --git a/test/dm/reset.c b/test/dm/reset.c index e2d6f456230c..d3158bf4a72e 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -3,7 +3,6 @@ * Copyright (c) 2016, NVIDIA CORPORATION. */

-#include <common.h> #include <dm.h> #include <dm/device-internal.h> #include <log.h> diff --git a/test/dm/rkmtd.c b/test/dm/rkmtd.c index 3c3e8efa92f2..3dc9ca1add11 100644 --- a/test/dm/rkmtd.c +++ b/test/dm/rkmtd.c @@ -8,7 +8,6 @@ * Copyright (C) 2023 Johan Jonker jbx6244@gmail.com */

-#include <common.h> #include <blk.h> #include <dm.h> #include <fs.h> diff --git a/test/dm/rng.c b/test/dm/rng.c index 6d1f68848d52..c8ed6cadf586 100644 --- a/test/dm/rng.c +++ b/test/dm/rng.c @@ -3,7 +3,6 @@ * Copyright (c) 2019, Linaro Limited */

-#include <common.h> #include <dm.h> #include <log.h> #include <rng.h> diff --git a/test/dm/rtc.c b/test/dm/rtc.c index bf97dbbd2f9e..a8aa41955c22 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <console.h> #include <dm.h> #include <i2c.h> diff --git a/test/dm/scmi.c b/test/dm/scmi.c index adf36ffaab1d..69fc900e3429 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -12,7 +12,6 @@ * unknown SCMI protocol ID. */

-#include <common.h> #include <clk.h> #include <dm.h> #include <reset.h> diff --git a/test/dm/scsi.c b/test/dm/scsi.c index 380cfc88baba..5180159fb27d 100644 --- a/test/dm/scsi.c +++ b/test/dm/scsi.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <part.h> #include <scsi.h> diff --git a/test/dm/serial.c b/test/dm/serial.c index 34b783e062e1..34c0d4db879a 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -3,7 +3,6 @@ * Copyright (c) 2018, STMicroelectronics */

-#include <common.h> #include <log.h> #include <serial.h> #include <dm.h> diff --git a/test/dm/sf.c b/test/dm/sf.c index 17d43fef3bc3..0e3a0f13f9ec 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -3,7 +3,6 @@ * Copyright (C) 2013 Google, Inc */

-#include <common.h> #include <command.h> #include <dm.h> #include <fdtdec.h> diff --git a/test/dm/simple-bus.c b/test/dm/simple-bus.c index 3530b47fac2f..8a730ba2fce4 100644 --- a/test/dm/simple-bus.c +++ b/test/dm/simple-bus.c @@ -3,7 +3,6 @@ * Copyright (C) 2021, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/simple_bus.h> diff --git a/test/dm/simple-pm-bus.c b/test/dm/simple-pm-bus.c index 792c74505806..9949cb34d596 100644 --- a/test/dm/simple-pm-bus.c +++ b/test/dm/simple-pm-bus.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/device-internal.h> diff --git a/test/dm/sm.c b/test/dm/sm.c index 7ebb0c9c85ed..4d95c2ad75bd 100644 --- a/test/dm/sm.c +++ b/test/dm/sm.c @@ -5,7 +5,6 @@ * Author: Alexey Romanov avromanov@salutedevices.com */

-#include <common.h> #include <dm.h> #include <sm.h> #include <sandbox-sm.h> diff --git a/test/dm/smem.c b/test/dm/smem.c index 289fb59ba136..adcbfe574ab9 100644 --- a/test/dm/smem.c +++ b/test/dm/smem.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Ramon Fried ramon.fried@gmail.com */

-#include <common.h> #include <dm.h> #include <smem.h> #include <dm/test.h> diff --git a/test/dm/soc.c b/test/dm/soc.c index 8f6c97fa7908..cb0ac1545f7f 100644 --- a/test/dm/soc.c +++ b/test/dm/soc.c @@ -6,7 +6,6 @@ * Dave Gerlach d-gerlach@ti.com */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <dm/uclass-internal.h> diff --git a/test/dm/sound.c b/test/dm/sound.c index 15d545ab5a34..f4e6215e6830 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <sound.h> #include <dm/test.h> diff --git a/test/dm/spi.c b/test/dm/spi.c index 325799bbf104..1ab2dd783249 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -3,7 +3,6 @@ * Copyright (C) 2013 Google, Inc */

-#include <common.h> #include <dm.h> #include <fdtdec.h> #include <spi.h> diff --git a/test/dm/spmi.c b/test/dm/spmi.c index 97bb0eb30fc9..e10ae8db4d30 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -3,7 +3,6 @@ * (C) Copyright 2015 Mateusz Kulikowski mateusz.kulikowski@gmail.com */

-#include <common.h> #include <fdtdec.h> #include <dm.h> #include <malloc.h> diff --git a/test/dm/syscon-reset.c b/test/dm/syscon-reset.c index eeaddf88392c..ba19504573f4 100644 --- a/test/dm/syscon-reset.c +++ b/test/dm/syscon-reset.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <dm/test.h> #include <regmap.h> diff --git a/test/dm/syscon.c b/test/dm/syscon.c index be2329723362..04d324e87d44 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <log.h> #include <syscon.h> diff --git a/test/dm/sysinfo-gpio.c b/test/dm/sysinfo-gpio.c index 2e494b3f3412..24a99dafb152 100644 --- a/test/dm/sysinfo-gpio.c +++ b/test/dm/sysinfo-gpio.c @@ -3,7 +3,6 @@ * Copyright (C) 2021 Sean Anderson sean.anderson@seco.com */

-#include <common.h> #include <dm.h> #include <log.h> #include <sysinfo.h> diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c index 96b3a8ebabac..7444a580df6e 100644 --- a/test/dm/sysinfo.c +++ b/test/dm/sysinfo.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <dm.h> #include <log.h> #include <dm/test.h> diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 5aa69e046186..f3a859be7878 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <dm.h> #include <sysreset.h> #include <asm/state.h> diff --git a/test/dm/tag.c b/test/dm/tag.c index 8ae8a1fcd65b..bce8a35acfb5 100644 --- a/test/dm/tag.c +++ b/test/dm/tag.c @@ -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 */ diff --git a/test/dm/tee.c b/test/dm/tee.c index 7a11bf891389..bb02a9b3c98b 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Linaro Limited */

-#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/test/dm/test-dm.c b/test/dm/test-dm.c index e73a1dd8f814..4bc2c45db61c 100644 --- a/test/dm/test-dm.c +++ b/test/dm/test-dm.c @@ -3,7 +3,6 @@ * Copyright (c) 2013 Google, Inc */

-#include <common.h> #include <test/suites.h> #include <test/test.h>

diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index 02cb974b0f74..851177c3018a 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -6,7 +6,6 @@ * Pavel Herrmann morpheus.ibis@gmail.com */

-#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 72d0eb57e212..18c89eef43fc 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -3,7 +3,6 @@ * Copyright (c) 2013 Google, Inc */

-#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 067701734a08..9a80cc63667b 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -6,7 +6,6 @@ * Pavel Herrmann morpheus.ibis@gmail.com */

-#include <common.h> #include <log.h> #include <malloc.h> #include <dm.h> diff --git a/test/dm/timer.c b/test/dm/timer.c index 9f94d4769200..7fcefc42e595 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Thomas Chou thomas@wytron.com.tw */

-#include <common.h> #include <dm.h> #include <timer.h> #include <dm/test.h> diff --git a/test/dm/tpm.c b/test/dm/tpm.c index cde933ab2848..0e413c0eedd0 100644 --- a/test/dm/tpm.c +++ b/test/dm/tpm.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <dm.h> #include <tpm_api.h> #include <dm/test.h> diff --git a/test/dm/usb.c b/test/dm/usb.c index 7671ef156d84..9a571938b816 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -3,7 +3,6 @@ * Copyright (C) 2015 Google, Inc */

-#include <common.h> #include <console.h> #include <dm.h> #include <part.h> diff --git a/test/dm/video.c b/test/dm/video.c index d907f681600b..7dfbeb9555d1 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bzlib.h> #include <dm.h> #include <gzip.h> diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 3e108cdc35d0..3efd7c74f427 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/virtio_device.c b/test/dm/virtio_device.c index fdda4da41781..63dc53415b73 100644 --- a/test/dm/virtio_device.c +++ b/test/dm/virtio_device.c @@ -3,7 +3,6 @@ * Copyright (C) 2018, Bin Meng bmeng.cn@gmail.com */

-#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/virtio_rng.c b/test/dm/virtio_rng.c index 8b9a04b1fdef..ab7d862d79ef 100644 --- a/test/dm/virtio_rng.c +++ b/test/dm/virtio_rng.c @@ -4,7 +4,6 @@ * Written by Andrew Scull ascull@google.com */

-#include <common.h> #include <dm.h> #include <virtio_types.h> #include <virtio.h> diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 2bbebcdbf286..1df2da23c6c7 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -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> diff --git a/test/env/attr.c b/test/env/attr.c index 8d5c0f1c3df4..de5d5d4ee27c 100644 --- a/test/env/attr.c +++ b/test/env/attr.c @@ -4,7 +4,6 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */

-#include <common.h> #include <command.h> #include <env_attr.h> #include <test/env.h> diff --git a/test/env/cmd_ut_env.c b/test/env/cmd_ut_env.c index d65a32179ce1..13e0998341e7 100644 --- a/test/env/cmd_ut_env.c +++ b/test/env/cmd_ut_env.c @@ -4,7 +4,6 @@ * Joe Hershberger, National Instruments, joe.hershberger@ni.com */

-#include <common.h> #include <command.h> #include <test/env.h> #include <test/suites.h> diff --git a/test/env/fdt.c b/test/env/fdt.c index 30bfa88c3550..c495ac7b307c 100644 --- a/test/env/fdt.c +++ b/test/env/fdt.c @@ -1,4 +1,3 @@ -#include <common.h> #include <command.h> #include <env_attr.h> #include <test/env.h> diff --git a/test/env/hashtable.c b/test/env/hashtable.c index 70102f9121c2..ccdf0138c4b8 100644 --- a/test/env/hashtable.c +++ b/test/env/hashtable.c @@ -4,11 +4,11 @@ * Roman Kapl, SYSGO, rka@sysgo.com */

-#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>

diff --git a/test/fuzz/cmd_fuzz.c b/test/fuzz/cmd_fuzz.c index d0bc7b8d7b76..faa140433ff5 100644 --- a/test/fuzz/cmd_fuzz.c +++ b/test/fuzz/cmd_fuzz.c @@ -5,7 +5,6 @@ */

#include <command.h> -#include <common.h> #include <dm.h> #include <fuzzing_engine.h> #include <test/fuzz.h> diff --git a/test/fuzz/virtio.c b/test/fuzz/virtio.c index 8a47667e7785..836eb9a2f660 100644 --- a/test/fuzz/virtio.c +++ b/test/fuzz/virtio.c @@ -4,7 +4,6 @@ * Written by Andrew Scull ascull@google.com */

-#include <common.h> #include <dm.h> #include <virtio.h> #include <virtio_ring.h> diff --git a/test/image/spl_load.c b/test/image/spl_load.c index e1036eff28ca..7cbad40ea0cd 100644 --- a/test/image/spl_load.c +++ b/test/image/spl_load.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <image.h> #include <imx_container.h> #include <mapmem.h> diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index a89189e1124c..935078bf67b4 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <blk.h> #include <ext_common.h> #include <ext4fs.h> diff --git a/test/image/spl_load_net.c b/test/image/spl_load_net.c index 9d067a7a592f..4af6e21b8b98 100644 --- a/test/image/spl_load_net.c +++ b/test/image/spl_load_net.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <spl.h> #include <test/spl.h> diff --git a/test/image/spl_load_nor.c b/test/image/spl_load_nor.c index de5686343b99..f53a6724e27f 100644 --- a/test/image/spl_load_nor.c +++ b/test/image/spl_load_nor.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <spl.h> #include <asm/io.h> diff --git a/test/image/spl_load_os.c b/test/image/spl_load_os.c index 26228a8a4a9c..7d5fb9b07e05 100644 --- a/test/image/spl_load_os.c +++ b/test/image/spl_load_os.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <image.h> #include <os.h> #include <spl.h> diff --git a/test/image/spl_load_spi.c b/test/image/spl_load_spi.c index 54a95465e239..80836dc0dffa 100644 --- a/test/image/spl_load_spi.c +++ b/test/image/spl_load_spi.c @@ -3,7 +3,6 @@ * Copyright (C) 2023 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <dm.h> #include <spi_flash.h> #include <spl.h> diff --git a/test/lib/abuf.c b/test/lib/abuf.c index 42803b20e2a1..7c0481ab610b 100644 --- a/test/lib/abuf.c +++ b/test/lib/abuf.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <abuf.h> #include <mapmem.h> #include <test/lib.h> diff --git a/test/lib/asn1.c b/test/lib/asn1.c index a66cdd77df0a..4842b7058ac5 100644 --- a/test/lib/asn1.c +++ b/test/lib/asn1.c @@ -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> diff --git a/test/lib/cmd_ut_lib.c b/test/lib/cmd_ut_lib.c index f1ac015b2c89..f98cb9b3c572 100644 --- a/test/lib/cmd_ut_lib.c +++ b/test/lib/cmd_ut_lib.c @@ -5,7 +5,6 @@ * Unit tests for library functions */

-#include <common.h> #include <command.h> #include <test/lib.h> #include <test/suites.h> diff --git a/test/lib/efi_device_path.c b/test/lib/efi_device_path.c index 24e2f23c5af5..290c8768fa4c 100644 --- a/test/lib/efi_device_path.c +++ b/test/lib/efi_device_path.c @@ -5,7 +5,6 @@ * Copyright (c) 2020 Heinrich Schuchardt xypron.glpk@gmx.de */

-#include <common.h> #include <efi_loader.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/efi_image_region.c b/test/lib/efi_image_region.c index 0b888f843378..3ca49dc4a2eb 100644 --- a/test/lib/efi_image_region.c +++ b/test/lib/efi_image_region.c @@ -3,7 +3,6 @@ * (C) Copyright 2020, Heinrich Schuchardt xypron.glpk@gmx.de */

-#include <common.h> #include <efi_loader.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/getopt.c b/test/lib/getopt.c index 3c68b93c8a59..388a076200b3 100644 --- a/test/lib/getopt.c +++ b/test/lib/getopt.c @@ -6,7 +6,6 @@ * posix/tst-getopt-cancel.c */

-#include <common.h> #include <getopt.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/hexdump.c b/test/lib/hexdump.c index 5dccf4388663..d531a830398d 100644 --- a/test/lib/hexdump.c +++ b/test/lib/hexdump.c @@ -4,7 +4,6 @@ * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc */

-#include <common.h> #include <hexdump.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c index 3914f699659f..0c463bb794a5 100644 --- a/test/lib/kconfig.c +++ b/test/lib/kconfig.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/kconfig_spl.c b/test/lib/kconfig_spl.c index 8f8a3411b14f..3bd8abdf4b8e 100644 --- a/test/lib/kconfig_spl.c +++ b/test/lib/kconfig_spl.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/lmb.c b/test/lib/lmb.c index 7e4368de22e2..4b5b6e5e2098 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -3,7 +3,6 @@ * (C) Copyright 2018 Simon Goldschmidt */

-#include <common.h> #include <dm.h> #include <lmb.h> #include <log.h> diff --git a/test/lib/longjmp.c b/test/lib/longjmp.c index 201367a5a3a2..79d889bdd5fa 100644 --- a/test/lib/longjmp.c +++ b/test/lib/longjmp.c @@ -5,7 +5,6 @@ * Copyright (c) 2021, Heinrich Schuchardt xypron.glpk@gmx.de */

-#include <common.h> #include <test/lib.h> #include <test/test.h> #include <test/ut.h> diff --git a/test/lib/rsa.c b/test/lib/rsa.c index 44f8ade226f4..40f70010c788 100644 --- a/test/lib/rsa.c +++ b/test/lib/rsa.c @@ -6,7 +6,6 @@ * Unit test for rsa_verify() function */

-#include <common.h> #include <command.h> #include <image.h> #include <test/lib.h> diff --git a/test/lib/sscanf.c b/test/lib/sscanf.c index 772e4b920425..9fe5521749fd 100644 --- a/test/lib/sscanf.c +++ b/test/lib/sscanf.c @@ -9,7 +9,6 @@ * Unit tests for sscanf() function */

-#include <common.h> #include <command.h> #include <log.h> #include <test/lib.h> diff --git a/test/lib/string.c b/test/lib/string.c index 5dcf4d6db003..d08dbca92915 100644 --- a/test/lib/string.c +++ b/test/lib/string.c @@ -9,7 +9,6 @@ * This has to be considered in testing. */

-#include <common.h> #include <command.h> #include <log.h> #include <test/lib.h> diff --git a/test/lib/strlcat.c b/test/lib/strlcat.c index d8453fe78e2c..d1a0293271b0 100644 --- a/test/lib/strlcat.c +++ b/test/lib/strlcat.c @@ -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> diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c index cbc712f7eda3..cfd9d8ca5a93 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -5,7 +5,6 @@ * Unit tests for aes functions */

-#include <common.h> #include <command.h> #include <hexdump.h> #include <rand.h> diff --git a/test/lib/test_crypt.c b/test/lib/test_crypt.c index fb21edf97484..dcdadd992c15 100644 --- a/test/lib/test_crypt.c +++ b/test/lib/test_crypt.c @@ -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> diff --git a/test/lib/test_errno_str.c b/test/lib/test_errno_str.c index 8a9f1fd9805a..67f76442b271 100644 --- a/test/lib/test_errno_str.c +++ b/test/lib/test_errno_str.c @@ -9,7 +9,6 @@ * This has to be considered in testing. */

-#include <common.h> #include <command.h> #include <errno.h> #include <test/lib.h> diff --git a/test/lib/test_print.c b/test/lib/test_print.c index 79b67c779321..c7fc50a1de17 100644 --- a/test/lib/test_print.c +++ b/test/lib/test_print.c @@ -5,7 +5,6 @@ * Copyright 2020, Heinrich Schuchadt xypron.glpk@gmx.de */

-#include <common.h> #include <command.h> #include <display_options.h> #include <asm/global_data.h> diff --git a/test/lib/uuid.c b/test/lib/uuid.c index e24331a13668..0914f2c47e77 100644 --- a/test/lib/uuid.c +++ b/test/lib/uuid.c @@ -8,7 +8,6 @@ * Abdellatif El Khlifi abdellatif.elkhlifi@arm.com */

-#include <common.h> #include <uuid.h> #include <test/lib.h> #include <test/test.h> diff --git a/test/log/cont_test.c b/test/log/cont_test.c index de7b7f064cd5..036d44b9d73d 100644 --- a/test/log/cont_test.c +++ b/test/log/cont_test.c @@ -5,7 +5,6 @@ * Test continuation of log messages. */

-#include <common.h> #include <console.h> #include <asm/global_data.h> #include <test/log.h> diff --git a/test/log/log_filter.c b/test/log/log_filter.c index b644b40a850d..9cc891dc48c1 100644 --- a/test/log/log_filter.c +++ b/test/log/log_filter.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Sean Anderson seanga2@gmail.com */

-#include <common.h> #include <console.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/log_test.c b/test/log/log_test.c index c5abff80d111..855353a9c409 100644 --- a/test/log/log_test.c +++ b/test/log/log_test.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <command.h> #include <log.h> #include <asm/global_data.h> diff --git a/test/log/log_ut.c b/test/log/log_ut.c index 5aa3a1840045..6617ed8b1525 100644 --- a/test/log/log_ut.c +++ b/test/log/log_ut.c @@ -5,7 +5,6 @@ * Logging function tests. */

-#include <common.h> #include <console.h> #include <log.h> #include <test/log.h> diff --git a/test/log/nolog_ndebug.c b/test/log/nolog_ndebug.c index bd9a4f408e7b..b714a16d2e7e 100644 --- a/test/log/nolog_ndebug.c +++ b/test/log/nolog_ndebug.c @@ -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> diff --git a/test/log/nolog_test.c b/test/log/nolog_test.c index 4e52e5bed822..c4c0fa6cf81a 100644 --- a/test/log/nolog_test.c +++ b/test/log/nolog_test.c @@ -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> diff --git a/test/log/pr_cont_test.c b/test/log/pr_cont_test.c index df4520d28075..30f30d98fe14 100644 --- a/test/log/pr_cont_test.c +++ b/test/log/pr_cont_test.c @@ -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> diff --git a/test/log/syslog_test.c b/test/log/syslog_test.c index 4db649db8226..c4180f775b95 100644 --- a/test/log/syslog_test.c +++ b/test/log/syslog_test.c @@ -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> diff --git a/test/log/syslog_test_ndebug.c b/test/log/syslog_test_ndebug.c index 4438791044d0..b10e636812b5 100644 --- a/test/log/syslog_test_ndebug.c +++ b/test/log/syslog_test_ndebug.c @@ -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> diff --git a/test/optee/cmd_ut_optee.c b/test/optee/cmd_ut_optee.c index c3887ab11d92..c6f50e0995ac 100644 --- a/test/optee/cmd_ut_optee.c +++ b/test/optee/cmd_ut_optee.c @@ -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> diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c index 56a3df17138b..bcb29a26e216 100644 --- a/test/overlay/cmd_ut_overlay.c +++ b/test/overlay/cmd_ut_overlay.c @@ -4,7 +4,6 @@ * Copyright (c) 2016 Free Electrons */

-#include <common.h> #include <command.h> #include <errno.h> #include <fdt_support.h> diff --git a/test/print_ut.c b/test/print_ut.c index bb844d2542b7..bded2b6ebe5a 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -3,7 +3,6 @@ * Copyright (c) 2012, The Chromium Authors */

-#include <common.h> #include <command.h> #include <efi_api.h> #include <display_options.h> diff --git a/test/stdint/int-types.c b/test/stdint/int-types.c index f6d09e8643d6..9051e32c7ced 100644 --- a/test/stdint/int-types.c +++ b/test/stdint/int-types.c @@ -1,4 +1,4 @@ -#include <common.h> +#include <linux/types.h>

int test_types(void) { diff --git a/test/str_ut.c b/test/str_ut.c index fa9328ede501..389779859a3d 100644 --- a/test/str_ut.c +++ b/test/str_ut.c @@ -3,7 +3,6 @@ * Copyright 2020 Google LLC */

-#include <common.h> #include <vsprintf.h> #include <test/suites.h> #include <test/test.h> diff --git a/test/test-main.c b/test/test-main.c index b7015d9f38dd..3fa6f6e32ec8 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <blk.h> #include <console.h> #include <cyclic.h> diff --git a/test/time_ut.c b/test/time_ut.c index 80b82dbfd833..149c4b58f4a1 100644 --- a/test/time_ut.c +++ b/test/time_ut.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <command.h> #include <errno.h> #include <time.h> diff --git a/test/unicode_ut.c b/test/unicode_ut.c index 47c3f52774cd..13e29c9b9e32 100644 --- a/test/unicode_ut.c +++ b/test/unicode_ut.c @@ -5,7 +5,6 @@ * Copyright (c) 2018 Heinrich Schuchardt xypron.glpk@gmx.de */

-#include <common.h> #include <charset.h> #include <command.h> #include <efi_loader.h> diff --git a/test/ut.c b/test/ut.c index 628e9dc98050..ae99831ac8ff 100644 --- a/test/ut.c +++ b/test/ut.c @@ -5,7 +5,6 @@ * Copyright (c) 2013 Google, Inc */

-#include <common.h> #include <console.h> #include <malloc.h> #ifdef CONFIG_SANDBOX

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

Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)

diff --git a/common/autoboot.c b/common/autoboot.c index 6f0aeae6bf33..898a57bc92bd 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -4,13 +4,14 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#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> diff --git a/common/bloblist.c b/common/bloblist.c index ad06d7a1795d..11d6422b695a 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY LOGC_BLOBLIST

-#include <common.h> #include <bloblist.h> #include <display_options.h> #include <log.h> diff --git a/common/board_f.c b/common/board_f.c index 039d6d712d05..212ffb3090b2 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -9,7 +9,7 @@ * Marius Groeger mgroeger@sysgo.de */

-#include <common.h> +#include <config.h> #include <bloblist.h> #include <bootstage.h> #include <clock_legacy.h> diff --git a/common/board_info.c b/common/board_info.c index f4c385add90c..33c260b404e8 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+

-#include <common.h> #include <dm.h> #include <init.h> #include <sysinfo.h> diff --git a/common/board_r.c b/common/board_r.c index da0b80f24ff0..c823cd262f16 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -9,7 +9,7 @@ * Marius Groeger mgroeger@sysgo.de */

-#include <common.h> +#include <config.h> #include <api.h> #include <bootstage.h> #include <cpu_func.h> diff --git a/common/bootstage.c b/common/bootstage.c index 0e6d80718fd5..fb6befcbc4a8 100644 --- a/common/bootstage.c +++ b/common/bootstage.c @@ -11,7 +11,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <bootstage.h> #include <hang.h> #include <log.h> diff --git a/common/bouncebuf.c b/common/bouncebuf.c index 934b83f7ec3f..b2f87e4d939b 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -5,7 +5,6 @@ * Copyright (C) 2012 Marek Vasut marex@denx.de */

-#include <common.h> #include <cpu_func.h> #include <log.h> #include <malloc.h> diff --git a/common/cli.c b/common/cli.c index 1c33daf1149a..4694a35cd0e0 100644 --- a/common/cli.c +++ b/common/cli.c @@ -10,7 +10,6 @@

#define pr_fmt(fmt) "cli: %s: " fmt, __func__

-#include <common.h> #include <ansi.h> #include <bootstage.h> #include <cli.h> diff --git a/common/cli_getch.c b/common/cli_getch.c index 0ee790877748..a5ed6eb6fcfa 100644 --- a/common/cli_getch.c +++ b/common/cli_getch.c @@ -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 diff --git a/common/cli_hush.c b/common/cli_hush.c index 9cda97f30e3c..96a98209b9d2 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -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 */ diff --git a/common/cli_readline.c b/common/cli_readline.c index cf4339d0e509..4cb82b40149a 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -8,7 +8,6 @@ * JinHua Luo, GuangDong Linux Center, luo.jinhua@gd-linux.com */

-#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; diff --git a/common/cli_simple.c b/common/cli_simple.c index f89ba92d1b05..266c444334eb 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -8,7 +8,6 @@ * JinHua Luo, GuangDong Linux Center, luo.jinhua@gd-linux.com */

-#include <common.h> #include <bootretry.h> #include <cli.h> #include <command.h> diff --git a/common/command.c b/common/command.c index af8ffdba8f8c..3f691399cbee 100644 --- a/common/command.c +++ b/common/command.c @@ -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>

diff --git a/common/console.c b/common/console.c index aa3053bc4414..63f78004fdbc 100644 --- a/common/console.c +++ b/common/console.c @@ -4,7 +4,6 @@ * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it */

-#include <common.h> #include <console.h> #include <debug_uart.h> #include <display_options.h> diff --git a/common/cros_ec.c b/common/cros_ec.c index 249d1f19411e..9ccc8fa16cdb 100644 --- a/common/cros_ec.c +++ b/common/cros_ec.c @@ -8,7 +8,6 @@ * Software Foundation. */

-#include <common.h> #include <cros_ec.h> #include <dm.h> #include <errno.h> diff --git a/common/ddr_spd.c b/common/ddr_spd.c index 58dc9b3781b7..2f6eb99bf0cf 100644 --- a/common/ddr_spd.c +++ b/common/ddr_spd.c @@ -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 diff --git a/common/dfu.c b/common/dfu.c index 0d154e8d4c48..1af8194139c3 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -10,7 +10,6 @@ * Lukasz Majewski l.majewski@samsung.com */

-#include <common.h> #include <command.h> #include <log.h> #include <watchdog.h> diff --git a/common/dlmalloc.c b/common/dlmalloc.c index a0616217d495..9549c59f3585 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -12,7 +12,6 @@ #define DEBUG #endif

-#include <common.h> #include <log.h> #include <asm/global_data.h>

diff --git a/common/edid.c b/common/edid.c index 556c4e3434b6..865ba9daa78a 100644 --- a/common/edid.c +++ b/common/edid.c @@ -9,7 +9,6 @@ * Copyright (C) Nalin Dahyabhai bigfun@pobox.com */

-#include <common.h> #include <edid.h> #include <errno.h> #include <fdtdec.h> diff --git a/common/eeprom/eeprom_field.c b/common/eeprom/eeprom_field.c index f56eebe679f7..3bacb1ae7eb7 100644 --- a/common/eeprom/eeprom_field.c +++ b/common/eeprom/eeprom_field.c @@ -6,7 +6,8 @@ * Igor Grinberg grinberg@compulab.co.il */

-#include <common.h> +#include <stdio.h> +#include <vsprintf.h> #include <linux/string.h> #include <eeprom_field.h>

diff --git a/common/eeprom/eeprom_layout.c b/common/eeprom/eeprom_layout.c index 5a9be1da061f..1a425c1754d4 100644 --- a/common/eeprom/eeprom_layout.c +++ b/common/eeprom/eeprom_layout.c @@ -6,8 +6,8 @@ * Igor Grinberg grinberg@compulab.co.il */

-#include <common.h> #include <linux/kernel.h> +#include <linux/string.h> #include <eeprom_layout.h> #include <eeprom_field.h>

diff --git a/common/event.c b/common/event.c index 16c2ba6cc921..dda569d44785 100644 --- a/common/event.c +++ b/common/event.c @@ -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>

diff --git a/common/exports.c b/common/exports.c index 20d8b759bc25..48b084c38613 100644 --- a/common/exports.c +++ b/common/exports.c @@ -1,4 +1,3 @@ -#include <common.h> #include <command.h> #include <exports.h> #include <malloc.h> diff --git a/common/flash.c b/common/flash.c index 848f44e59dfd..24ddc8bee724 100644 --- a/common/flash.c +++ b/common/flash.c @@ -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>

diff --git a/common/hash.c b/common/hash.c index 3d6b84de4738..ac63803fed95 100644 --- a/common/hash.c +++ b/common/hash.c @@ -10,7 +10,6 @@ */

#ifndef USE_HOSTCC -#include <common.h> #include <command.h> #include <env.h> #include <log.h> diff --git a/common/hwconfig.c b/common/hwconfig.c index cac0b6348f46..afaa6cb37ab4 100644 --- a/common/hwconfig.c +++ b/common/hwconfig.c @@ -10,7 +10,6 @@

#ifndef HWCONFIG_TEST #include <config.h> -#include <common.h> #include <env.h> #include <exports.h> #include <hwconfig.h> diff --git a/common/init/board_init.c b/common/init/board_init.c index ed2365daa35e..a06ec1caa2ca 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -6,7 +6,7 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> +#include <config.h> #include <bootstage.h> #include <init.h> #include <asm/global_data.h> diff --git a/common/init/handoff.c b/common/init/handoff.c index d0be1bb17a2c..687513bda353 100644 --- a/common/init/handoff.c +++ b/common/init/handoff.c @@ -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;

diff --git a/common/iomux.c b/common/iomux.c index c428f7110a7a..1224c15eb718 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -4,7 +4,6 @@ * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. */

-#include <common.h> #include <console.h> #include <serial.h> #include <malloc.h> diff --git a/common/iotrace.c b/common/iotrace.c index 63d0cca3a004..a0a5613bd9b3 100644 --- a/common/iotrace.c +++ b/common/iotrace.c @@ -5,7 +5,6 @@

#define IOTRACE_IMPL

-#include <common.h> #include <mapmem.h> #include <time.h> #include <asm/global_data.h> diff --git a/common/kallsyms.c b/common/kallsyms.c index 13344e634b99..49b3897078ae 100644 --- a/common/kallsyms.c +++ b/common/kallsyms.c @@ -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)); diff --git a/common/kgdb.c b/common/kgdb.c index 29b09fcfe56b..01a09f176286 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -87,7 +87,6 @@ * ****************************************************************************/

-#include <common.h> #include <asm/ptrace.h>

#include <kgdb.h> diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index 66aed7cea1c7..256d88697d7e 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -7,7 +7,6 @@ * Licensed under the GPL-2 or later. */

-#include <common.h> #include <cpu_func.h> #include <kgdb.h> #include <serial.h> diff --git a/common/log.c b/common/log.c index 42d35f04b689..dfee250b158a 100644 --- a/common/log.c +++ b/common/log.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <display_options.h> #include <log.h> #include <malloc.h> diff --git a/common/log_console.c b/common/log_console.c index bb091ce21a4a..c27101b8fe22 100644 --- a/common/log_console.c +++ b/common/log_console.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <log.h> #include <asm/global_data.h>

diff --git a/common/log_syslog.c b/common/log_syslog.c index 53c4def5d1c0..d01bb749c22d 100644 --- a/common/log_syslog.c +++ b/common/log_syslog.c @@ -5,7 +5,6 @@ * Copyright (c) 2020, Heinrich Schuchardt xypron.glpk@gmx.de */

-#include <common.h> #include <log.h> #include <net.h> #include <asm/global_data.h> diff --git a/common/main.c b/common/main.c index 82d3aafa53c9..b0b6e74f5d3d 100644 --- a/common/main.c +++ b/common/main.c @@ -6,7 +6,6 @@

/* #define DEBUG */

-#include <common.h> #include <autoboot.h> #include <button.h> #include <bootstage.h> diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 0a004d40e1ec..4e6d7952b3ca 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -7,7 +7,6 @@

#define LOG_CATEGORY LOGC_ALLOC

-#include <common.h> #include <log.h> #include <malloc.h> #include <mapmem.h> diff --git a/common/memsize.c b/common/memsize.c index d646df8b04cb..86109579c954 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <init.h> #include <asm/global_data.h> #include <cpu_func.h> diff --git a/common/menu.c b/common/menu.c index b55cf7b99967..e48424995b64 100644 --- a/common/menu.c +++ b/common/menu.c @@ -5,7 +5,6 @@ */

#include <ansi.h> -#include <common.h> #include <cli.h> #include <malloc.h> #include <errno.h> diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 194c84e7e89d..9b8744e5d8bf 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -9,7 +9,6 @@ * channel. */

-#include <common.h> #include <dm.h> #include <log.h> #include <miiphy.h> diff --git a/common/s_record.c b/common/s_record.c index 2b7651fcffca..486dd93abd41 100644 --- a/common/s_record.c +++ b/common/s_record.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> #include <s_record.h>

static int hex1_bin (char c); diff --git a/common/scp03.c b/common/scp03.c index 09ef7b5ba3dc..54b1bd54b604 100644 --- a/common/scp03.c +++ b/common/scp03.c @@ -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) { diff --git a/common/spl/spl.c b/common/spl/spl.c index e06bc75d36b2..4e92771ecaae 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -6,7 +6,7 @@ * Aneesh V aneesh@ti.com */

-#include <common.h> +#include <config.h> #include <bloblist.h> #include <binman_sym.h> #include <bootstage.h> diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 3bdd013a35fe..0b1c981a105d 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -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> diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index 04eac6f306bd..bc551c5c074c 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -5,7 +5,6 @@ * */

-#include <common.h> #include <spl.h> #include <spl_load.h> #include <image.h> diff --git a/common/spl/spl_bootrom.c b/common/spl/spl_bootrom.c index 0eefd39a5198..e172a2d7b83c 100644 --- a/common/spl/spl_bootrom.c +++ b/common/spl/spl_bootrom.c @@ -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, diff --git a/common/spl/spl_dfu.c b/common/spl/spl_dfu.c index 8a779da8fa1e..e9f381c392cd 100644 --- a/common/spl/spl_dfu.c +++ b/common/spl/spl_dfu.c @@ -5,7 +5,6 @@ * * Ravi B ravibabu@ti.com */ -#include <common.h> #include <env.h> #include <spl.h> #include <linux/compiler.h> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 2be6f04b02c5..2399e1d806d4 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+

-#include <common.h> #include <env.h> #include <part.h> #include <spl.h> diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index a52f9e178e66..2e320ba7c018 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -8,7 +8,6 @@ * FAT Image Functions copied from spl_mmc.c */

-#include <common.h> #include <env.h> #include <log.h> #include <spl.h> diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index e5195d460c49..988125be008d 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <errno.h> #include <fpga.h> #include <gzip.h> diff --git a/common/spl/spl_imx_container.c b/common/spl/spl_imx_container.c index b4ea9241d685..2c31777fcd3a 100644 --- a/common/spl/spl_imx_container.c +++ b/common/spl/spl_imx_container.c @@ -4,7 +4,6 @@ */

#define LOG_CATEGORY LOGC_ARCH -#include <common.h> #include <stdlib.h> #include <errno.h> #include <imx_container.h> diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 08687ca8f6c4..a77893455f25 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese sr@denx.de */

-#include <common.h> #include <image.h> #include <log.h> #include <malloc.h> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 3d032bb27ce3..f4481b90463a 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -5,7 +5,6 @@ * * Aneesh V aneesh@ti.com */ -#include <common.h> #include <dm.h> #include <log.h> #include <part.h> diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 3b0a15242389..5631fa6d5635 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -3,7 +3,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz schwarz@corscience.de */ -#include <common.h> #include <config.h> #include <fdt_support.h> #include <image.h> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 898f9df705a2..be7278bb9334 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -6,7 +6,6 @@ * (C) Copyright 2012 * Ilya Yanok ilya.yanok@gmail.com */ -#include <common.h> #include <env.h> #include <errno.h> #include <image.h> diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 70745114efed..ed76b5e1293b 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -3,7 +3,7 @@ * Copyright (C) 2012 Stefan Roese sr@denx.de */

-#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c index c8774d67ecf1..0e15a3c7545a 100644 --- a/common/spl/spl_nvme.c +++ b/common/spl/spl_nvme.c @@ -5,7 +5,6 @@ * */

-#include <common.h> #include <spl.h> #include <nvme.h>

diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index 53a8c6de89eb..f6f65286c216 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -7,7 +7,6 @@ * Copyright (C) 2011 * Corscience GmbH & Co. KG - Simon Schwarz schwarz@corscience.de */ -#include <common.h> #include <config.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c index ec62aab929b9..5a26d7c31a43 100644 --- a/common/spl/spl_opensbi.c +++ b/common/spl/spl_opensbi.c @@ -5,7 +5,6 @@ * * Based on common/spl/spl_atf.c */ -#include <common.h> #include <cpu_func.h> #include <errno.h> #include <hang.h> diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index 8aeda237be13..5a23841f6981 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -9,7 +9,6 @@ * Michal Simek michal.simek@amd.com * Stefan Agner stefan.agner@toradex.com */ -#include <common.h> #include <binman_sym.h> #include <image.h> #include <log.h> diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 32746ce9f3cf..18acc40e46fc 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -8,7 +8,6 @@ * Derived work from spl_usb.c */

-#include <common.h> #include <spl.h> #include <asm/u-boot.h> #include <sata.h> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c index 9143c27bbf1d..9ca80bd534f8 100644 --- a/common/spl/spl_sdp.c +++ b/common/spl/spl_sdp.c @@ -4,7 +4,6 @@ * Author: Stefan Agner stefan.agner@toradex.com */

-#include <common.h> #include <log.h> #include <spl.h> #include <usb.h> diff --git a/common/spl/spl_semihosting.c b/common/spl/spl_semihosting.c index 941fa911040e..2047248f39b0 100644 --- a/common/spl/spl_semihosting.c +++ b/common/spl/spl_semihosting.c @@ -3,7 +3,6 @@ * Copyright (C) 2022 Sean Anderson sean.anderson@seco.com */

-#include <common.h> #include <image.h> #include <log.h> #include <semihosting.h> diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 89de73c726cd..8ab4803f7c4b 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -8,7 +8,7 @@ * Heiko Schocher, DENX Software Engineering, hs@denx.de. */

-#include <common.h> +#include <config.h> #include <image.h> #include <imx_container.h> #include <log.h> diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index d7ab9efd1108..a8d3f43b4528 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -4,7 +4,6 @@ * Ladislav Michl ladis@linux-mips.org */

-#include <common.h> #include <config.h> #include <image.h> #include <nand.h> diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index 479e2dc1826e..31fc4b57d486 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -8,7 +8,6 @@ * Derived work from spl_mmc.c */

-#include <common.h> #include <log.h> #include <spl.h> #include <asm/u-boot.h> diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c index 959915ffa610..1465c3e46b92 100644 --- a/common/spl/spl_xip.c +++ b/common/spl/spl_xip.c @@ -4,7 +4,7 @@ * Author(s): Vikas Manocha, vikas.manocha@st.com for STMicroelectronics. */

-#include <common.h> +#include <config.h> #include <image.h> #include <log.h> #include <spl.h> diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index 1faaa2c938d4..fd48f80f75e3 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -8,7 +8,6 @@ * * Matt Porter mporter@ti.com */ -#include <common.h> #include <gzip.h> #include <image.h> #include <log.h> diff --git a/common/splash.c b/common/splash.c index 6820db683bd6..c5591293634a 100644 --- a/common/splash.c +++ b/common/splash.c @@ -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[] = { { diff --git a/common/splash_source.c b/common/splash_source.c index 2ce0768833d9..5b2711604495 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -5,7 +5,6 @@ * Authors: Igor Grinberg grinberg@compulab.co.il */

-#include <common.h> #include <bmp_layout.h> #include <command.h> #include <env.h> diff --git a/common/stackprot.c b/common/stackprot.c index 6495951a773c..4e3297b7d006 100644 --- a/common/stackprot.c +++ b/common/stackprot.c @@ -3,7 +3,6 @@ * Copyright 2021 Broadcom */

-#include <common.h> #include <asm/global_data.h>

DECLARE_GLOBAL_DATA_PTR; diff --git a/common/stdio.c b/common/stdio.c index e3354f092dc9..a61220ce4b9c 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -9,7 +9,6 @@ */

#include <config.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/common/update.c b/common/update.c index ec302ca68fb0..eb0b60a2ce48 100644 --- a/common/update.c +++ b/common/update.c @@ -6,7 +6,6 @@ * Bartlomiej Sieka tur@semihalf.com */

-#include <common.h> #include <cpu_func.h> #include <image.h> #include <linux/printk.h> diff --git a/common/usb.c b/common/usb.c index 99e6b857c74c..84b10f5c7d8c 100644 --- a/common/usb.c +++ b/common/usb.c @@ -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> diff --git a/common/usb_hub.c b/common/usb_hub.c index 2e054eb93537..807f490bb609 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -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> diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 820f591fc5bb..f3b4a3c94e6d 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -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 diff --git a/common/usb_onboard_hub.c b/common/usb_onboard_hub.c index 89e18a2ddad6..68a04ac0412b 100644 --- a/common/usb_onboard_hub.c +++ b/common/usb_onboard_hub.c @@ -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> diff --git a/common/usb_storage.c b/common/usb_storage.c index 774d5bdf54b4..a79ed2e23a44 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -32,7 +32,6 @@ */

-#include <common.h> #include <blk.h> #include <bootdev.h> #include <command.h> diff --git a/common/xyzModem.c b/common/xyzModem.c index fb319f711907..9feb240de281 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -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 */

diff --git a/include/atf_common.h b/include/atf_common.h index d69892fac6cb..5ae450902523 100644 --- a/include/atf_common.h +++ b/include/atf_common.h @@ -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. diff --git a/include/autoboot.h b/include/autoboot.h index eb204995d079..c68bd79f8dca 100644 --- a/include/autoboot.h +++ b/include/autoboot.h @@ -12,6 +12,7 @@ #define __AUTOBOOT_H

#include <stdbool.h> +#include <stddef.h>

#ifdef CONFIG_SANDBOX

diff --git a/include/bmp_layout.h b/include/bmp_layout.h index a5c9498dc9fb..eabbd25a3309 100644 --- a/include/bmp_layout.h +++ b/include/bmp_layout.h @@ -10,6 +10,8 @@ #ifndef _BMP_H_ #define _BMP_H_

+#include <linux/compiler.h> + struct __packed bmp_color_table_entry { __u8 blue; __u8 green; diff --git a/include/ddr_spd.h b/include/ddr_spd.h index fe163da43e56..c4d199fd7e14 100644 --- a/include/ddr_spd.h +++ b/include/ddr_spd.h @@ -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 diff --git a/include/flash.h b/include/flash.h index 3710a2731b76..0f7369774117 100644 --- a/include/flash.h +++ b/include/flash.h @@ -7,6 +7,8 @@ #ifndef _FLASH_H_ #define _FLASH_H_

+#include <linux/types.h> + /*----------------------------------------------------------------------- * FLASH Info: contains chip specific data, per FLASH bank */ diff --git a/include/gzip.h b/include/gzip.h index e578b283edcd..5e0d0ec07fbc 100644 --- a/include/gzip.h +++ b/include/gzip.h @@ -7,6 +7,8 @@ #ifndef __GZIP_H #define __GZIP_H

+#include <linux/types.h> + struct blk_desc;

/** diff --git a/include/handoff.h b/include/handoff.h index 0104b834f2c4..c0ae7b19a759 100644 --- a/include/handoff.h +++ b/include/handoff.h @@ -10,6 +10,7 @@

#if CONFIG_IS_ENABLED(HANDOFF)

+#include <linux/types.h> #include <asm/handoff.h>

/** diff --git a/include/nand.h b/include/nand.h index 220ffa202ef9..cdba7384ad14 100644 --- a/include/nand.h +++ b/include/nand.h @@ -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); diff --git a/include/s_record.h b/include/s_record.h index 3ece695941d3..aab09d9c3c81 100644 --- a/include/s_record.h +++ b/include/s_record.h @@ -4,6 +4,8 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

+#include <linux/types.h> + /*-------------------------------------------------------------------------- * * Motorola S-Record Format:

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

Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)

diff --git a/boot/android_ab.c b/boot/android_ab.c index 1e5aa81b7503..143f373aae96 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -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> diff --git a/boot/boot_fit.c b/boot/boot_fit.c index 9d3941265636..4dcaf95c6ae3 100644 --- a/boot/boot_fit.c +++ b/boot/boot_fit.c @@ -7,7 +7,6 @@ */

#include <boot_fit.h> -#include <common.h> #include <errno.h> #include <image.h> #include <log.h> diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index 46815ea2fdbf..7c7bba088c99 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <dm.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootflow.c b/boot/bootflow.c index 68bf99329ab0..9aa3179c3881 100644 --- a/boot/bootflow.c +++ b/boot/bootflow.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootflow_menu.c b/boot/bootflow_menu.c index 16f9cd8f8ca5..143ef8413326 100644 --- a/boot/bootflow_menu.c +++ b/boot/bootflow_menu.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootflow.h> #include <bootstd.h> #include <cli.h> diff --git a/boot/bootm.c b/boot/bootm.c index 032f5a4a1605..6fa8edab021e 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -5,7 +5,6 @@ */

#ifndef USE_HOSTCC -#include <common.h> #include <bootm.h> #include <bootstage.h> #include <cli.h> diff --git a/boot/bootm_os.c b/boot/bootm_os.c index ccde72d22c17..15297ddb530b 100644 --- a/boot/bootm_os.c +++ b/boot/bootm_os.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> #include <bootm.h> #include <bootstage.h> #include <cpu_func.h> diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index 1d157d54dbdd..c0abadef97ca 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -6,7 +6,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <blk.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index f015f2e1c75f..645b8bed1020 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <blk.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index aebc5207fc01..c7035c0d0c4e 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index b7d429f2c3da..23ae1e610ac7 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index ae0ad1d53e3f..9b55686948f7 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index 70f693aa239b..03d2589c264f 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_qfw.c b/boot/bootmeth_qfw.c index 8ebbc3ebcd58..dfaa944594e3 100644 --- a/boot/bootmeth_qfw.c +++ b/boot/bootmeth_qfw.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <command.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/bootmeth_sandbox.c b/boot/bootmeth_sandbox.c index aabc57e635a8..0bc8f688e30b 100644 --- a/boot/bootmeth_sandbox.c +++ b/boot/bootmeth_sandbox.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index 06340e43d2d7..0e05d28d4d9b 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <blk.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/bootretry.c b/boot/bootretry.c index 8d850df9d487..587b2de7d6b0 100644 --- a/boot/bootretry.c +++ b/boot/bootretry.c @@ -4,12 +4,13 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#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 */ diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index 81555d341e32..5de8efce19a5 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootflow.h> #include <bootstd.h> #include <dm.h> diff --git a/boot/cedit.c b/boot/cedit.c index 8c654dba6dc3..c29a2be14ce2 100644 --- a/boot/cedit.c +++ b/boot/cedit.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_EXPO

-#include <common.h> #include <abuf.h> #include <cedit.h> #include <cli.h> diff --git a/boot/common_fit.c b/boot/common_fit.c index cde2dc45e907..a2f9b8d83c3b 100644 --- a/boot/common_fit.c +++ b/boot/common_fit.c @@ -4,7 +4,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <errno.h> #include <image.h> #include <log.h> diff --git a/boot/expo.c b/boot/expo.c index cadb6a0ad6e3..ed01483f1d3a 100644 --- a/boot/expo.c +++ b/boot/expo.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_EXPO

-#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/expo_build.c b/boot/expo_build.c index 04d88a2c3081..a4df798adebd 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_EXPO

-#include <common.h> #include <expo.h> #include <fdtdec.h> #include <log.h> diff --git a/boot/fdt_simplefb.c b/boot/fdt_simplefb.c index 837920bd3a33..53415548459a 100644 --- a/boot/fdt_simplefb.c +++ b/boot/fdt_simplefb.c @@ -6,7 +6,6 @@ * Stephen Warren swarren@wwwdotorg.org */

-#include <common.h> #include <dm.h> #include <fdt_support.h> #include <asm/global_data.h> diff --git a/boot/fdt_support.c b/boot/fdt_support.c index 2bd80a9dfb18..874ca4d6f5af 100644 --- a/boot/fdt_support.c +++ b/boot/fdt_support.c @@ -6,7 +6,6 @@ * Copyright 2010-2011 Freescale Semiconductor, Inc. */

-#include <common.h> #include <abuf.h> #include <env.h> #include <log.h> diff --git a/boot/image-android-dt.c b/boot/image-android-dt.c index fb014190d445..3b25018c2e77 100644 --- a/boot/image-android-dt.c +++ b/boot/image-android-dt.c @@ -6,7 +6,6 @@

#include <image-android-dt.h> #include <dt_table.h> -#include <common.h> #include <linux/libfdt.h> #include <mapmem.h>

diff --git a/boot/image-android.c b/boot/image-android.c index 88e40bc7ec6c..ddd8ffd5e540 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -3,7 +3,6 @@ * Copyright (c) 2011 Sebastian Andrzej Siewior bigeasy@linutronix.de */

-#include <common.h> #include <env.h> #include <image.h> #include <image-android-dt.h> diff --git a/boot/image-board.c b/boot/image-board.c index 09b6e4e0bdca..b7884b8c5dc7 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -8,7 +8,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <bootstage.h> #include <cpu_func.h> #include <display_options.h> diff --git a/boot/image-cipher.c b/boot/image-cipher.c index b9061489396c..9d389f26cea5 100644 --- a/boot/image-cipher.c +++ b/boot/image-cipher.c @@ -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; diff --git a/boot/image-fdt.c b/boot/image-fdt.c index f09716cba303..56dd7687f51c 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -8,7 +8,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> #include <command.h> #include <fdt_support.h> #include <fdtdec.h> diff --git a/boot/image-fit-sig.c b/boot/image-fit-sig.c index 12369896fe3f..fe328df4a850 100644 --- a/boot/image-fit-sig.c +++ b/boot/image-fit-sig.c @@ -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> diff --git a/boot/image-fit.c b/boot/image-fit.c index 89e377563ce6..fb03cab831bd 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -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> diff --git a/boot/image-pre-load.c b/boot/image-pre-load.c index b504ab42a544..cc19017404c8 100644 --- a/boot/image-pre-load.c +++ b/boot/image-pre-load.c @@ -3,7 +3,6 @@ * Copyright (C) 2021 Philippe Reynes philippe.reynes@softathome.com */

-#include <common.h> #include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; #include <image.h> diff --git a/boot/image-sig.c b/boot/image-sig.c index 0421a61b0406..6bc74866eaed 100644 --- a/boot/image-sig.c +++ b/boot/image-sig.c @@ -3,7 +3,6 @@ * Copyright (c) 2013, Google Inc. */

-#include <common.h> #include <log.h> #include <malloc.h> #include <asm/global_data.h> diff --git a/boot/image.c b/boot/image.c index 073931cd7a3f..eb12e4be04ac 100644 --- a/boot/image.c +++ b/boot/image.c @@ -7,7 +7,6 @@ */

#ifndef USE_HOSTCC -#include <common.h> #include <env.h> #include <display_options.h> #include <init.h> diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 962056267503..db2ae7047928 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -4,7 +4,6 @@ * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. */

-#include <common.h> #include <command.h> #include <dm.h> #include <env.h> diff --git a/boot/scene.c b/boot/scene.c index d4dfb49ada15..ac976aa26bbe 100644 --- a/boot/scene.c +++ b/boot/scene.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_EXPO

-#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/scene_menu.c b/boot/scene_menu.c index 63994165efba..80bd7457cb1a 100644 --- a/boot/scene_menu.c +++ b/boot/scene_menu.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_EXPO

-#include <common.h> #include <dm.h> #include <expo.h> #include <malloc.h> diff --git a/boot/scene_textline.c b/boot/scene_textline.c index 6ea072a1c268..bba8663b98da 100644 --- a/boot/scene_textline.c +++ b/boot/scene_textline.c @@ -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, diff --git a/boot/vbe.c b/boot/vbe.c index 52b328300374..00673de7ee2e 100644 --- a/boot/vbe.c +++ b/boot/vbe.c @@ -6,7 +6,6 @@ * Written by Simon Glass sjg@chromium.org */

-#include <common.h> #include <bootmeth.h> #include <bootstd.h> #include <dm.h> diff --git a/boot/vbe_request.c b/boot/vbe_request.c index 917251afa1ca..dc15b04f5bbf 100644 --- a/boot/vbe_request.c +++ b/boot/vbe_request.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <dm.h> #include <event.h> #include <image.h> diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 12682abd3996..189e86d2a223 100644 --- a/boot/vbe_simple.c +++ b/boot/vbe_simple.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c index d59a704ddbad..4d6da9490a76 100644 --- a/boot/vbe_simple_fw.c +++ b/boot/vbe_simple_fw.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <bloblist.h> #include <bootdev.h> #include <bootflow.h> diff --git a/boot/vbe_simple_os.c b/boot/vbe_simple_os.c index 84626cdeaf24..b4126d8d2d0b 100644 --- a/boot/vbe_simple_os.c +++ b/boot/vbe_simple_os.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY LOGC_BOOT

-#include <common.h> #include <dm.h> #include <bootflow.h> #include <vbe.h>

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

Signed-off-by: Tom Rini trini@konsulko.com --- 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(-)

diff --git a/net/arp.c b/net/arp.c index 37848ad32fbd..bc1e25f941f7 100644 --- a/net/arp.c +++ b/net/arp.c @@ -9,10 +9,10 @@ * Copyright 2000-2002 Wolfgang Denk, wd@denx.de */

-#include <common.h> #include <env.h> #include <log.h> #include <net.h> +#include <vsprintf.h> #include <linux/delay.h>

#include "arp.h" diff --git a/net/bootp.c b/net/bootp.c index c15472f5d37f..5efee7f37776 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -8,7 +8,6 @@ * Copyright 2000-2004 Wolfgang Denk, wd@denx.de */

-#include <common.h> #include <bootstage.h> #include <command.h> #include <env.h> diff --git a/net/cdp.c b/net/cdp.c index a8f890e75226..d4cfc587ee35 100644 --- a/net/cdp.c +++ b/net/cdp.c @@ -9,7 +9,6 @@ * Copyright 2000-2002 Wolfgang Denk, wd@denx.de */

-#include <common.h> #include <net.h>

#include "cdp.h" diff --git a/net/dhcpv6.c b/net/dhcpv6.c index 4aea779f6f24..54619ee69836 100644 --- a/net/dhcpv6.c +++ b/net/dhcpv6.c @@ -7,7 +7,6 @@

/* Simple DHCP6 network layer implementation. */

-#include <common.h> #include <net6.h> #include <malloc.h> #include <linux/delay.h> diff --git a/net/dns.c b/net/dns.c index 5b1fe5b01037..c2f0ab98c8d0 100644 --- a/net/dns.c +++ b/net/dns.c @@ -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> diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 3d0ec91dfa49..4e3933fd05f3 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -7,7 +7,6 @@

#define LOG_CATEGORY UCLASS_ETH

-#include <common.h> #include <bootdev.h> #include <bootstage.h> #include <dm.h> diff --git a/net/eth_bootdev.c b/net/eth_bootdev.c index 869adf8cbbd3..6ee54e3c7901 100644 --- a/net/eth_bootdev.c +++ b/net/eth_bootdev.c @@ -8,7 +8,6 @@

#define LOG_CATEGORY UCLASS_BOOTSTD

-#include <common.h> #include <bootdev.h> #include <bootflow.h> #include <command.h> diff --git a/net/eth_common.c b/net/eth_common.c index 14d4c07b695d..89b5bb371897 100644 --- a/net/eth_common.c +++ b/net/eth_common.c @@ -5,7 +5,6 @@ * Joe Hershberger, National Instruments */

-#include <common.h> #include <bootstage.h> #include <dm.h> #include <env.h> diff --git a/net/fastboot_tcp.c b/net/fastboot_tcp.c index 2eb52ea25679..d1fccbc72386 100644 --- a/net/fastboot_tcp.c +++ b/net/fastboot_tcp.c @@ -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> diff --git a/net/fastboot_udp.c b/net/fastboot_udp.c index 6fee441ab3b6..d1479510d61a 100644 --- a/net/fastboot_udp.c +++ b/net/fastboot_udp.c @@ -3,7 +3,6 @@ * Copyright (C) 2016 The Android Open Source Project */

-#include <common.h> #include <command.h> #include <fastboot.h> #include <net.h> diff --git a/net/link_local.c b/net/link_local.c index 8aec3c79969b..179721333ffc 100644 --- a/net/link_local.c +++ b/net/link_local.c @@ -11,7 +11,6 @@ * Licensed under the GPL v2 or later */

-#include <common.h> #include <env.h> #include <log.h> #include <net.h> diff --git a/net/mdio-mux-uclass.c b/net/mdio-mux-uclass.c index 94b90e065762..ee188b504d16 100644 --- a/net/mdio-mux-uclass.c +++ b/net/mdio-mux-uclass.c @@ -4,7 +4,6 @@ * Alex Marginean, NXP */

-#include <common.h> #include <dm.h> #include <log.h> #include <miiphy.h> diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 0ebfb2f1343a..4f052ae432c6 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -4,7 +4,6 @@ * Alex Marginean, NXP */

-#include <common.h> #include <dm.h> #include <dm/lists.h> #include <eth_phy.h> diff --git a/net/ndisc.c b/net/ndisc.c index d1cec0601c83..d417c5987ac4 100644 --- a/net/ndisc.c +++ b/net/ndisc.c @@ -9,7 +9,6 @@

/* Neighbour Discovery for IPv6 */

-#include <common.h> #include <net.h> #include <net6.h> #include <ndisc.h> diff --git a/net/net.c b/net/net.c index 0fb2d2507734..23b5d3356afa 100644 --- a/net/net.c +++ b/net/net.c @@ -81,7 +81,6 @@ */

-#include <common.h> #include <bootstage.h> #include <command.h> #include <console.h> diff --git a/net/net6.c b/net/net6.c index 2dd64c0e1618..4cff98df15cf 100644 --- a/net/net6.c +++ b/net/net6.c @@ -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; diff --git a/net/nfs.c b/net/nfs.c index c18282448ccd..acc7106f10d4 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -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 diff --git a/net/pcap.c b/net/pcap.c index 4036d8a3fa53..c959e3e4e511 100644 --- a/net/pcap.c +++ b/net/pcap.c @@ -3,10 +3,10 @@ * Copyright 2019 Ramon Fried rfried.dev@gmail.com */

-#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 diff --git a/net/ping6.c b/net/ping6.c index 4882a17f510b..2479e08fd82f 100644 --- a/net/ping6.c +++ b/net/ping6.c @@ -9,7 +9,6 @@

/* Simple ping6 implementation */

-#include <common.h> #include <net.h> #include <net6.h> #include "ndisc.h" diff --git a/net/rarp.c b/net/rarp.c index 231b6233c07a..a6b564e314d4 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> #include <command.h> #include <log.h> #include <net.h> diff --git a/net/sntp.c b/net/sntp.c index dac0f8ceea1b..73d1d87d38b1 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -5,7 +5,6 @@ * */

-#include <common.h> #include <command.h> #include <dm.h> #include <log.h> diff --git a/net/tcp.c b/net/tcp.c index a713e1dd6096..b0cc8a1fe3ed 100644 --- a/net/tcp.c +++ b/net/tcp.c @@ -17,7 +17,6 @@ * - TCP application (eg wget) * Next Step HTTPS? */ -#include <common.h> #include <command.h> #include <console.h> #include <env_internal.h> diff --git a/net/tftp.c b/net/tftp.c index 2e335413492b..6b16bdcbe4c2 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -5,7 +5,6 @@ * Copyright 2011 Comelit Group SpA, * Luca Ceresoli luca.ceresoli@comelit.it */ -#include <common.h> #include <command.h> #include <display_options.h> #include <efi_loader.h> diff --git a/net/udp.c b/net/udp.c index a93822f511cd..37162260d175 100644 --- a/net/udp.c +++ b/net/udp.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Philippe Reynes philippe.reynes@softathome.com */

-#include <common.h> #include <net.h> #include <net/udp.h>

diff --git a/net/wget.c b/net/wget.c index abab371e58ed..f1dd7abeff69 100644 --- a/net/wget.c +++ b/net/wget.c @@ -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> diff --git a/net/wol.c b/net/wol.c index 0a625668a992..96478ba5751e 100644 --- a/net/wol.c +++ b/net/wol.c @@ -3,7 +3,6 @@ * Copyright 2018 Lothar Felten, lothar.felten@gmail.com */

-#include <common.h> #include <command.h> #include <env.h> #include <net.h>

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

Signed-off-by: Tom Rini trini@konsulko.com --- post/cpu/mpc83xx/ecc.c | 2 +- post/drivers/flash.c | 2 +- post/drivers/i2c.c | 2 +- post/drivers/memory.c | 2 +- post/drivers/rtc.c | 2 +- post/lib_powerpc/andi.c | 2 +- post/lib_powerpc/b.c | 2 +- post/lib_powerpc/cmp.c | 2 +- post/lib_powerpc/cmpi.c | 2 +- post/lib_powerpc/complex.c | 2 +- post/lib_powerpc/cpu.c | 2 +- post/lib_powerpc/cr.c | 2 +- post/lib_powerpc/fpu/20001122-1.c | 2 +- post/lib_powerpc/fpu/20010114-2.c | 2 +- post/lib_powerpc/fpu/20010226-1.c | 2 +- post/lib_powerpc/fpu/980619-1.c | 2 +- post/lib_powerpc/fpu/acc1.c | 2 +- post/lib_powerpc/fpu/compare-fp-1.c | 2 +- post/lib_powerpc/fpu/fpu.c | 2 +- post/lib_powerpc/fpu/mul-subnormal-single-1.c | 2 +- post/lib_powerpc/load.c | 2 +- post/lib_powerpc/multi.c | 2 +- post/lib_powerpc/rlwimi.c | 2 +- post/lib_powerpc/rlwinm.c | 2 +- post/lib_powerpc/rlwnm.c | 2 +- post/lib_powerpc/srawi.c | 2 +- post/lib_powerpc/store.c | 2 +- post/lib_powerpc/string.c | 2 +- post/lib_powerpc/three.c | 2 +- post/lib_powerpc/threei.c | 2 +- post/lib_powerpc/threex.c | 2 +- post/lib_powerpc/two.c | 2 +- post/lib_powerpc/twox.c | 2 +- post/post.c | 2 +- post/tests.c | 3 ++- 35 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/post/cpu/mpc83xx/ecc.c b/post/cpu/mpc83xx/ecc.c index 68da8ff41716..766eafa00e71 100644 --- a/post/cpu/mpc83xx/ecc.c +++ b/post/cpu/mpc83xx/ecc.c @@ -8,7 +8,7 @@ * Dave Liu daveliu@freescale.com */

-#include <common.h> +#include <config.h> #include <cpu_func.h> #include <irq_func.h> #include <log.h> diff --git a/post/drivers/flash.c b/post/drivers/flash.c index a1fcf1f135d9..21e2f940fe92 100644 --- a/post/drivers/flash.c +++ b/post/drivers/flash.c @@ -7,7 +7,7 @@ */

#if CFG_POST & CFG_SYS_POST_FLASH -#include <common.h> +#include <config.h> #include <malloc.h> #include <post.h> #include <flash.h> diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c index 557d6329a4f0..11c3c8323523 100644 --- a/post/drivers/i2c.c +++ b/post/drivers/i2c.c @@ -21,7 +21,7 @@ * #endif */

-#include <common.h> +#include <config.h> #include <log.h> #include <post.h> #include <i2c.h> diff --git a/post/drivers/memory.c b/post/drivers/memory.c index 1be2b41df45d..8d4ae6fc6f1e 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <log.h> #include <asm/global_data.h>

diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c index cc7a49847ccd..030954ef3dca 100644 --- a/post/drivers/rtc.c +++ b/post/drivers/rtc.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h>

/* * RTC test diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 4f3021668800..3f525f516760 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/b.c b/post/lib_powerpc/b.c index 0ec032dcb152..9c9931c4f3a9 100644 --- a/post/lib_powerpc/b.c +++ b/post/lib_powerpc/b.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c index 57f2b9694c33..9237dd539979 100644 --- a/post/lib_powerpc/cmp.c +++ b/post/lib_powerpc/cmp.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c index 6e2bd636d74d..6436586b2914 100644 --- a/post/lib_powerpc/cmpi.c +++ b/post/lib_powerpc/cmpi.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/complex.c b/post/lib_powerpc/complex.c index 751bce673785..2899dece2c1d 100644 --- a/post/lib_powerpc/complex.c +++ b/post/lib_powerpc/complex.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/cpu.c b/post/lib_powerpc/cpu.c index 98a8c6392c3a..e41e6b3b97b1 100644 --- a/post/lib_powerpc/cpu.c +++ b/post/lib_powerpc/cpu.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <cpu_func.h>

/* diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c index 3c7b61138467..1e011f12159e 100644 --- a/post/lib_powerpc/cr.c +++ b/post/lib_powerpc/cr.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/fpu/20001122-1.c b/post/lib_powerpc/fpu/20001122-1.c index 9c1c886fc4f7..d6b7bc656f69 100644 --- a/post/lib_powerpc/fpu/20001122-1.c +++ b/post/lib_powerpc/fpu/20001122-1.c @@ -7,7 +7,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/20010114-2.c b/post/lib_powerpc/fpu/20010114-2.c index 01bac5003836..5e79c4c69843 100644 --- a/post/lib_powerpc/fpu/20010114-2.c +++ b/post/lib_powerpc/fpu/20010114-2.c @@ -7,7 +7,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/20010226-1.c b/post/lib_powerpc/fpu/20010226-1.c index cc4aa0dca645..a65ffcedb49a 100644 --- a/post/lib_powerpc/fpu/20010226-1.c +++ b/post/lib_powerpc/fpu/20010226-1.c @@ -7,7 +7,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/980619-1.c b/post/lib_powerpc/fpu/980619-1.c index 111a2013fb58..8ad256efa9f8 100644 --- a/post/lib_powerpc/fpu/980619-1.c +++ b/post/lib_powerpc/fpu/980619-1.c @@ -7,7 +7,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/acc1.c b/post/lib_powerpc/fpu/acc1.c index 63cc3eeafc30..408c391ce42b 100644 --- a/post/lib_powerpc/fpu/acc1.c +++ b/post/lib_powerpc/fpu/acc1.c @@ -7,7 +7,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/compare-fp-1.c b/post/lib_powerpc/fpu/compare-fp-1.c index 4b4589664f12..4b8537ea3db3 100644 --- a/post/lib_powerpc/fpu/compare-fp-1.c +++ b/post/lib_powerpc/fpu/compare-fp-1.c @@ -9,7 +9,7 @@ * This file is originally a part of the GCC testsuite. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/fpu/fpu.c b/post/lib_powerpc/fpu/fpu.c index 59109f71e36a..2afe27ab3559 100644 --- a/post/lib_powerpc/fpu/fpu.c +++ b/post/lib_powerpc/fpu/fpu.c @@ -6,7 +6,7 @@ * Author: Sergei Poselenov sposelenov@emcraft.com */

-#include <common.h> +#include <config.h>

/* * FPU test diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c index 891aa95685fe..6b86e55e409e 100644 --- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c +++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c @@ -9,7 +9,7 @@ * numbers) are rounded to within 0.5 ulp. PR other/14354. */

-#include <common.h> +#include <config.h>

#include <post.h>

diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c index e4ac6bf186f9..0a2a4222846c 100644 --- a/post/lib_powerpc/load.c +++ b/post/lib_powerpc/load.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c index 4df45790ab65..6f991443741c 100644 --- a/post/lib_powerpc/multi.c +++ b/post/lib_powerpc/multi.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h> #include <log.h>

diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index da2191322570..35a9e9b83bf0 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index b0b976f98af4..2995eb358ef4 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index 22cd4568fc88..3ba3a7607ab3 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index a103df75eb1a..bd59ac4f36b5 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c index 71a4b6aba431..470ea37e77d0 100644 --- a/post/lib_powerpc/store.c +++ b/post/lib_powerpc/store.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/string.c b/post/lib_powerpc/string.c index 21e02bcb2664..c4ea5cf9ba9d 100644 --- a/post/lib_powerpc/string.c +++ b/post/lib_powerpc/string.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index 68339b05ef27..e65d7f023f95 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index 885dd8cb095e..0c3a2e6674b8 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index 62ac713ecff7..24ebc98d48df 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c index 7985669ba6eb..28c70ec88977 100644 --- a/post/lib_powerpc/two.c +++ b/post/lib_powerpc/two.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index 33d1a1d8d91d..7f6a898d6397 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <irq_func.h>

/* diff --git a/post/post.c b/post/post.c index 946d9094d451..705f94ccc919 100644 --- a/post/post.c +++ b/post/post.c @@ -4,7 +4,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> #include <bootstage.h> #include <env.h> #include <log.h> diff --git a/post/tests.c b/post/tests.c index 8cea428fcdc7..208710a48ba7 100644 --- a/post/tests.c +++ b/post/tests.c @@ -4,7 +4,8 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */

-#include <common.h> +#include <config.h> +#include <linux/kernel.h>

#include <post.h>