Remove and replace common.h and config.h in sandbox when it's not needed and add some explicit includes where needed.
Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - Drop <autoboot.h> from arch/sandbox/cpu/state.c as it's also not needed and leads to unrelated build failures with CMDLINE=n --- arch/sandbox/cpu/cache.c | 1 - arch/sandbox/cpu/cpu.c | 1 - arch/sandbox/cpu/sdl.c | 2 +- arch/sandbox/cpu/spl.c | 1 - arch/sandbox/cpu/start.c | 2 +- arch/sandbox/cpu/state.c | 3 +-- arch/sandbox/include/asm/io.h | 2 ++ arch/sandbox/include/asm/state.h | 1 - arch/sandbox/lib/bootm.c | 1 - arch/sandbox/lib/fdt_fixup.c | 1 - arch/sandbox/lib/interrupts.c | 1 - arch/sandbox/lib/pci_io.c | 1 - board/sandbox/sandbox.c | 2 +- 13 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/arch/sandbox/cpu/cache.c b/arch/sandbox/cpu/cache.c index 46c62c0b4461..c8a5e64214b6 100644 --- a/arch/sandbox/cpu/cache.c +++ b/arch/sandbox/cpu/cache.c @@ -3,7 +3,6 @@ * Copyright 2020, Heinrich Schuchardt xypron.glpk@gmx.de */
-#include <common.h> #include <cpu_func.h> #include <asm/state.h>
diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index a1c5c7c4311a..d6475c969c4d 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -5,7 +5,6 @@
#define LOG_CATEGORY LOGC_SANDBOX
-#include <common.h> #include <bootstage.h> #include <cpu_func.h> #include <errno.h> diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c index 590e406517bf..ed84646bdab7 100644 --- a/arch/sandbox/cpu/sdl.c +++ b/arch/sandbox/cpu/sdl.c @@ -72,7 +72,7 @@ static struct sdl_info { static void sandbox_sdl_poll_events(void) { /* - * We don't want to include common.h in this file since it uses + * We don't want to include cpu_func.h in this file since it uses * system headers. So add a declation here. */ extern void reset_cpu(void); diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 16b766279833..9ad9da686c6a 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -3,7 +3,6 @@ * Copyright (c) 2016 Google, Inc */
-#include <common.h> #include <dm.h> #include <hang.h> #include <handoff.h> diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index 2589c2eba738..dce804165296 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -3,7 +3,7 @@ * Copyright (c) 2011-2012 The Chromium OS Authors. */
-#include <common.h> +#include <config.h> #include <cli.h> #include <command.h> #include <efi_loader.h> diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c index e38bb248b7ff..a9ca79e76d2d 100644 --- a/arch/sandbox/cpu/state.c +++ b/arch/sandbox/cpu/state.c @@ -3,9 +3,8 @@ * Copyright (c) 2011-2012 The Chromium OS Authors. */
-#include <common.h> -#include <autoboot.h> #include <bloblist.h> +#include <config.h> #include <errno.h> #include <fdtdec.h> #include <log.h> diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 77a02e5f5241..3c0a102697ec 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -6,6 +6,8 @@ #ifndef __SANDBOX_ASM_IO_H #define __SANDBOX_ASM_IO_H
+#include <linux/types.h> + enum sandboxio_size_t { SB_SIZE_8, SB_SIZE_16, diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index 59a20595f51d..c84a1f7060f4 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -6,7 +6,6 @@ #ifndef __SANDBOX_STATE_H #define __SANDBOX_STATE_H
-#include <config.h> #include <sysreset.h> #include <stdbool.h> #include <linux/list.h> diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index a748ba650b12..290db4521702 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -4,7 +4,6 @@ * Copyright (c) 2015 Sjoerd Simons sjoerd.simons@collabora.co.uk */
-#include <common.h> #include <bootstage.h> #include <image.h> #include <asm/io.h> diff --git a/arch/sandbox/lib/fdt_fixup.c b/arch/sandbox/lib/fdt_fixup.c index a646f2059c2c..e333bd52ea28 100644 --- a/arch/sandbox/lib/fdt_fixup.c +++ b/arch/sandbox/lib/fdt_fixup.c @@ -2,7 +2,6 @@
#define LOG_CATEGORY LOGC_ARCH
-#include <common.h> #include <fdt_support.h> #include <log.h>
diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index 4d7cbff802c6..3f6583e11f04 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -5,7 +5,6 @@ * found in the LICENSE file. */
-#include <common.h> #include <efi_loader.h> #include <irq_func.h> #include <os.h> diff --git a/arch/sandbox/lib/pci_io.c b/arch/sandbox/lib/pci_io.c index 2038141947ab..6040eacb594f 100644 --- a/arch/sandbox/lib/pci_io.c +++ b/arch/sandbox/lib/pci_io.c @@ -8,7 +8,6 @@ * IO space access commands. */
-#include <common.h> #include <command.h> #include <dm.h> #include <log.h> diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 9d58860451c5..802596569c64 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -3,8 +3,8 @@ * Copyright (c) 2011 The Chromium OS Authors. */
-#include <common.h> #include <addr_map.h> +#include <config.h> #include <cpu_func.h> #include <cros_ec.h> #include <dm.h>