From: Simon Glass <sjg@chromium.org> Move the declaration of this function to a common header. Make sure it is included by files which define it. Fix up a few whitespace problems while here. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arc/lib/bootm.c | 2 +- arch/arm/cpu/arm11/cpu.c | 3 ++- arch/arm/cpu/arm720t/cpu.c | 2 ++ arch/arm/cpu/arm920t/cpu.c | 3 ++- arch/arm/cpu/arm926ejs/cpu.c | 3 ++- arch/arm/cpu/arm946es/cpu.c | 3 ++- arch/arm/cpu/armv7/cpu.c | 1 + arch/arm/cpu/armv7m/cpu.c | 1 + arch/arm/cpu/armv8/cpu.c | 1 + arch/arm/include/asm/u-boot-arm.h | 3 --- arch/arm/lib/spl.c | 1 + arch/arm/mach-rockchip/spl.c | 1 + arch/riscv/cpu/andes/cpu.c | 1 + arch/riscv/cpu/ast2700/cpu.c | 1 + arch/riscv/cpu/cv1800b/cpu.c | 2 ++ arch/riscv/cpu/fu540/cpu.c | 1 + arch/riscv/cpu/fu740/cpu.c | 1 + arch/riscv/cpu/generic/cpu.c | 1 + arch/riscv/cpu/jh7110/cpu.c | 1 + arch/riscv/include/asm/u-boot-riscv.h | 3 --- arch/riscv/lib/boot.c | 1 + arch/sandbox/cpu/cpu.c | 1 + arch/sandbox/include/asm/u-boot-sandbox.h | 2 -- arch/sh/cpu/sh4/cpu.c | 1 + arch/x86/include/asm/u-boot-x86.h | 2 -- include/bootm.h | 2 ++ 26 files changed, 29 insertions(+), 15 deletions(-) diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index b143392ee6c..0be0d40002d 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR; -static int cleanup_before_linux(void) +int cleanup_before_linux(void) { disable_interrupts(); sync_n_cleanup_cache_all(); diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c index 4bf0446b543..0ad6bce60f2 100644 --- a/arch/arm/cpu/arm11/cpu.c +++ b/arch/arm/cpu/arm11/cpu.c @@ -14,6 +14,7 @@ * CPU specific code */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> @@ -23,7 +24,7 @@ static void cache_flush(void); -int cleanup_before_linux (void) +int cleanup_before_linux(void) { /* * this function is called just before we call linux diff --git a/arch/arm/cpu/arm720t/cpu.c b/arch/arm/cpu/arm720t/cpu.c index ece09c83a4a..2ec4a9cbb89 100644 --- a/arch/arm/cpu/arm720t/cpu.c +++ b/arch/arm/cpu/arm720t/cpu.c @@ -9,6 +9,8 @@ * Alex Zuepke <azu@sysgo.de> */ +#include <bootm.h> + /* * cleanup_before_linux() - Prepare the CPU to jump to Linux * diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c index 61e18230573..73cd65b706a 100644 --- a/arch/arm/cpu/arm920t/cpu.c +++ b/arch/arm/cpu/arm920t/cpu.c @@ -12,6 +12,7 @@ * CPU specific code */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> @@ -19,7 +20,7 @@ static void cache_flush(void); -int cleanup_before_linux (void) +int cleanup_before_linux(void) { /* * this function is called just before we call linux diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c index 0e100e6f13d..10e18a41e14 100644 --- a/arch/arm/cpu/arm926ejs/cpu.c +++ b/arch/arm/cpu/arm926ejs/cpu.c @@ -12,6 +12,7 @@ * CPU specific code */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> @@ -33,7 +34,7 @@ void sdelay(unsigned long loops) "bne 1b":"=r" (loops):"0"(loops)); } -int cleanup_before_linux (void) +int cleanup_before_linux(void) { /* * this function is called just before we call linux diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index efd232d3423..45a857b7522 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -12,6 +12,7 @@ * CPU specific code */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> @@ -20,7 +21,7 @@ static void cache_flush(void); -int cleanup_before_linux (void) +int cleanup_before_linux(void) { /* * this function is called just before we call linux diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index f1b07c414de..b9f58e69464 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -14,6 +14,7 @@ * CPU specific code */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index b4440d3f3f8..02f3b63fbfb 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -7,6 +7,7 @@ * Kamil Lulko, <kamil.lulko@gmail.com> */ +#include <bootm.h> #include <cpu_func.h> #include <irq_func.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv8/cpu.c b/arch/arm/cpu/armv8/cpu.c index 275aa2501f1..c22bc02d2bd 100644 --- a/arch/arm/cpu/armv8/cpu.c +++ b/arch/arm/cpu/armv8/cpu.c @@ -10,6 +10,7 @@ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> */ +#include <bootm.h> #include <command.h> #include <cpu_func.h> #include <irq_func.h> diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index aef048708da..895e7a00838 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -25,9 +25,6 @@ extern ulong IRQ_STACK_START_IN; /* 8 bytes in IRQ stack */ void s_init(void); -/* cpu/.../cpu.c */ -int cleanup_before_linux(void); - /* Set up ARMv7 MMU, caches and TLBs */ void cpu_init_cp15(void); diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index c43a63f1819..1b66b5b5d19 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -7,6 +7,7 @@ * Tom Rini <trini@ti.com> */ +#include <bootm.h> #include <config.h> #include <init.h> #include <log.h> diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index 503e55dfc3a..f23e4291482 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -4,6 +4,7 @@ */ #include <bloblist.h> +#include <bootm.h> #include <cpu_func.h> #include <debug_uart.h> #include <dm.h> diff --git a/arch/riscv/cpu/andes/cpu.c b/arch/riscv/cpu/andes/cpu.c index d25ecba0e88..b59c0c723de 100644 --- a/arch/riscv/cpu/andes/cpu.c +++ b/arch/riscv/cpu/andes/cpu.c @@ -5,6 +5,7 @@ */ /* CPU specific code */ +#include <bootm.h> #include <cpu_func.h> #include <irq_func.h> #include <asm/cache.h> diff --git a/arch/riscv/cpu/ast2700/cpu.c b/arch/riscv/cpu/ast2700/cpu.c index c1540546a9a..7386f6f6740 100644 --- a/arch/riscv/cpu/ast2700/cpu.c +++ b/arch/riscv/cpu/ast2700/cpu.c @@ -4,6 +4,7 @@ * Copyright (C) 2024, Aspeed Technology Inc. */ +#include <bootm.h> #include <irq_func.h> #include <asm/cache.h> diff --git a/arch/riscv/cpu/cv1800b/cpu.c b/arch/riscv/cpu/cv1800b/cpu.c index 233a6a3d64e..05dd85cfd49 100644 --- a/arch/riscv/cpu/cv1800b/cpu.c +++ b/arch/riscv/cpu/cv1800b/cpu.c @@ -3,6 +3,8 @@ * Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com> */ +#include <bootm.h> + int cleanup_before_linux(void) { return 0; diff --git a/arch/riscv/cpu/fu540/cpu.c b/arch/riscv/cpu/fu540/cpu.c index f13c18942f3..f66f43351e5 100644 --- a/arch/riscv/cpu/fu540/cpu.c +++ b/arch/riscv/cpu/fu540/cpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ +#include <bootm.h> #include <irq_func.h> #include <asm/cache.h> diff --git a/arch/riscv/cpu/fu740/cpu.c b/arch/riscv/cpu/fu740/cpu.c index f13c18942f3..f66f43351e5 100644 --- a/arch/riscv/cpu/fu740/cpu.c +++ b/arch/riscv/cpu/fu740/cpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ +#include <bootm.h> #include <irq_func.h> #include <asm/cache.h> diff --git a/arch/riscv/cpu/generic/cpu.c b/arch/riscv/cpu/generic/cpu.c index f13c18942f3..f66f43351e5 100644 --- a/arch/riscv/cpu/generic/cpu.c +++ b/arch/riscv/cpu/generic/cpu.c @@ -3,6 +3,7 @@ * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> */ +#include <bootm.h> #include <irq_func.h> #include <asm/cache.h> diff --git a/arch/riscv/cpu/jh7110/cpu.c b/arch/riscv/cpu/jh7110/cpu.c index 1d7c026584a..65a881952e3 100644 --- a/arch/riscv/cpu/jh7110/cpu.c +++ b/arch/riscv/cpu/jh7110/cpu.c @@ -4,6 +4,7 @@ * Author: Yanhong Wang <yanhong.wang@starfivetech.com> */ +#include <bootm.h> #include <asm/cache.h> #include <irq_func.h> diff --git a/arch/riscv/include/asm/u-boot-riscv.h b/arch/riscv/include/asm/u-boot-riscv.h index 3a8fdb57136..f6ec024cd73 100644 --- a/arch/riscv/include/asm/u-boot-riscv.h +++ b/arch/riscv/include/asm/u-boot-riscv.h @@ -11,9 +11,6 @@ #ifndef _U_BOOT_RISCV_H_ #define _U_BOOT_RISCV_H_ 1 -/* cpu/.../cpu.c */ -int cleanup_before_linux(void); - /* board/.../... */ int board_init(void); int riscv_board_reserved_mem_fixup(void *fdt); diff --git a/arch/riscv/lib/boot.c b/arch/riscv/lib/boot.c index 161335abee1..81dc94bb963 100644 --- a/arch/riscv/lib/boot.c +++ b/arch/riscv/lib/boot.c @@ -4,6 +4,7 @@ * Rick Chen, Andes Technology Corporation <rick@andestech.com> */ +#include <bootm.h> #include <linux/types.h> #include <asm/u-boot-riscv.h> diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index 218057b94ad..d6177fbbd14 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -5,6 +5,7 @@ #define LOG_CATEGORY LOGC_SANDBOX +#include <bootm.h> #include <bootstage.h> #include <cpu_func.h> #include <errno.h> diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h index e7027747b37..23eaa3a45e6 100644 --- a/arch/sandbox/include/asm/u-boot-sandbox.h +++ b/arch/sandbox/include/asm/u-boot-sandbox.h @@ -21,8 +21,6 @@ int board_init(void); int sandbox_early_getopt_check(void); int sandbox_main_loop_init(void); -int cleanup_before_linux(void); - /* drivers/video/sandbox_sdl.c */ int sandbox_lcd_sdl_early_init(void); diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index 47a8549beba..6bf3052c4e8 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -4,6 +4,7 @@ * Nobuhiro Iwamatsu <iwamatsu@nigauri.org> */ +#include <bootm.h> #include <command.h> #include <irq_func.h> #include <cpu_func.h> diff --git a/arch/x86/include/asm/u-boot-x86.h b/arch/x86/include/asm/u-boot-x86.h index ed2f6aa3893..70b818115bd 100644 --- a/arch/x86/include/asm/u-boot-x86.h +++ b/arch/x86/include/asm/u-boot-x86.h @@ -76,7 +76,6 @@ void setup_gdt(struct global_data *id, u64 *gdt_addr); */ void setup_fsp_gdt(void); int init_cache(void); -int cleanup_before_linux(void); /* cpu/.../timer.c */ void timer_isr(void *); @@ -89,7 +88,6 @@ int i8254_init(void); /* cpu/.../interrupts.c */ int cpu_init_interrupts(void); -int cleanup_before_linux(void); int x86_cleanup_before_linux(void); void x86_enable_caches(void); void x86_disable_caches(void); diff --git a/include/bootm.h b/include/bootm.h index 05d55b2d948..6d37d299342 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -392,4 +392,6 @@ int bootm_boot_start(ulong addr, const char *cmdline); */ void bootm_final(enum bootm_final_t flags); +int cleanup_before_linux(void); + #endif -- 2.43.0