Move prototypes for function used in common/board_f.c from common.h to init.h Remove weak for arch_reserve_stacks in prototype (checkpatch issue)

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---

Changes in v2: - solve compilation error: add weak for arch_reserve_stacks in board_f.c as it is no more present in init.h

common/board_f.c | 2 +- include/common.h | 70 +++----------------------------------------------------- include/init.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c index c6bc53e..4df52f1 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -489,7 +489,7 @@ static int reserve_bootstage(void) return 0; }

-int arch_reserve_stacks(void) +__weak int arch_reserve_stacks(void) { return 0; } diff --git a/include/common.h b/include/common.h index 11e5459..6176195 100644 --- a/include/common.h +++ b/include/common.h @@ -62,34 +62,16 @@ typedef void (interrupt_handler_t)(void *); #define TOTAL_MALLOC_LEN CONFIG_SYS_MALLOC_LEN #endif

-/* startup functions */ +/* startup functions, used in: + * common/board_f.c + */ #include <init.h>

/* * Function Prototypes */ -int dram_init(void); - -/** - * dram_init_banksize() - Set up DRAM bank sizes - * - * This can be implemented by boards to set up the DRAM bank information in - * gd->bd->bi_dram(). It is called just before relocation, after dram_init() - * is called. - * - * If this is not provided, a default implementation will try to set up a - * single bank. It will do this if CONFIG_NR_DRAM_BANKS and - * CONFIG_SYS_SDRAM_BASE are set. The bank will have a start address of - * CONFIG_SYS_SDRAM_BASE and the size will be determined by a call to - * get_effective_memsize(). - * - * @return 0 if OK, -ve on error - */ -int dram_init_banksize(void); - void hang (void) __attribute__ ((noreturn));

-int timer_init(void); int cpu_init(void);

#include <display_options.h> @@ -113,7 +95,6 @@ int run_command_repeatable(const char *cmd, int flag); int run_command_list(const char *cmd, int len, int flag);

/* arch/$(ARCH)/lib/board.c */ -void board_init_f(ulong); void board_init_r(gd_t *, ulong) __attribute__ ((noreturn));

/** @@ -163,7 +144,6 @@ extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ int set_cpu_clk_info(void); int mdm_init(void); -int print_cpuinfo(void); int update_flash_size(int flash_size); int arch_early_init_r(void);

@@ -175,44 +155,6 @@ int arch_early_init_r(void); int setup_board_extra(void);

/** - * arch_fsp_init() - perform firmware support package init - * - * Where U-Boot relies on binary blobs to handle part of the system init, this - * function can be used to set up the blobs. This is used on some Intel - * platforms. - */ -int arch_fsp_init(void); - -/** - * arch_cpu_init_dm() - init CPU after driver model is available - * - * This is called immediately after driver model is available before - * relocation. This is similar to arch_cpu_init() but is able to reference - * devices - * - * @return 0 if OK, -ve on error - */ -int arch_cpu_init_dm(void); - -/** - * Reserve all necessary stacks - * - * This is used in generic board init sequence in common/board_f.c. Each - * architecture could provide this function to tailor the required stacks. - * - * On entry gd->start_addr_sp is pointing to the suggested top of the stack. - * The callee ensures gd->start_add_sp is 16-byte aligned, so architectures - * require only this can leave it untouched. - * - * On exit gd->start_addr_sp and gd->irq_sp should be set to the respective - * positions of the stack. The stack pointer(s) will be set to this later. - * gd->irq_sp is only required, if the architecture needs it. - * - * @return 0 if no error - */ -__weak int arch_reserve_stacks(void); - -/** * Show the DRAM size in a board-specific way * * This is used by boards to display DRAM information in their own way. @@ -231,7 +173,6 @@ void board_show_dram(phys_size_t size); */ int arch_fixup_fdt(void *blob);

-int reserve_mmu(void); /* common/flash.c */ void flash_perror (int);

@@ -361,11 +302,6 @@ int get_env_id (void); void pci_init (void); void pci_init_board(void);

-#if defined(CONFIG_DTB_RESELECT) -int embedded_dtb_select(void); -#endif - -int misc_init_f (void); int misc_init_r (void); #if defined(CONFIG_VID) int init_func_vid(void); diff --git a/include/init.h b/include/init.h index 324fbe0..f57a438 100644 --- a/include/init.h +++ b/include/init.h @@ -18,6 +18,7 @@ */

/* common/board_f.c */ +void board_init_f(ulong dummy);

/** * arch_cpu_init() - basic cpu-dependent setup for an architecture @@ -32,6 +33,17 @@ int arch_cpu_init(void);

/** + * arch_cpu_init_dm() - init CPU after driver model is available + * + * This is called immediately after driver model is available before + * relocation. This is similar to arch_cpu_init() but is able to reference + * devices + * + * @return 0 if OK, -ve on error + */ +int arch_cpu_init_dm(void); + +/** * mach_cpu_init() - SoC/machine dependent CPU setup * * This is called after arch_cpu_init(). It should handle any @@ -43,6 +55,60 @@ int arch_cpu_init(void); */ int mach_cpu_init(void);

+/** + * arch_fsp_init() - perform firmware support package init + * + * Where U-Boot relies on binary blobs to handle part of the system init, this + * function can be used to set up the blobs. This is used on some Intel + * platforms. + */ +int arch_fsp_init(void); + +int dram_init(void); + +/** + * dram_init_banksize() - Set up DRAM bank sizes + * + * This can be implemented by boards to set up the DRAM bank information in + * gd->bd->bi_dram(). It is called just before relocation, after dram_init() + * is called. + * + * If this is not provided, a default implementation will try to set up a + * single bank. It will do this if CONFIG_NR_DRAM_BANKS and + * CONFIG_SYS_SDRAM_BASE are set. The bank will have a start address of + * CONFIG_SYS_SDRAM_BASE and the size will be determined by a call to + * get_effective_memsize(). + * + * @return 0 if OK, -ve on error + */ +int dram_init_banksize(void); + +/** + * Reserve all necessary stacks + * + * This is used in generic board init sequence in common/board_f.c. Each + * architecture could provide this function to tailor the required stacks. + * + * On entry gd->start_addr_sp is pointing to the suggested top of the stack. + * The callee ensures gd->start_add_sp is 16-byte aligned, so architectures + * require only this can leave it untouched. + * + * On exit gd->start_addr_sp and gd->irq_sp should be set to the respective + * positions of the stack. The stack pointer(s) will be set to this later. + * gd->irq_sp is only required, if the architecture needs it. + * + * @return 0 if no error + */ +int arch_reserve_stacks(void); + +int print_cpuinfo(void); +int timer_init(void); +int reserve_mmu(void); +int misc_init_f(void); +#if defined(CONFIG_DTB_RESELECT) +int embedded_dtb_select(void); +#endif + /* common/board_r.c */

#endif /* __ASSEMBLY__ */

Move function prototypes for common/init/board_init.c from common.h to init.h

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---

Changes in v2: None

include/common.h | 38 +------------------------------------- include/init.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/include/common.h b/include/common.h index 6176195..62630db 100644 --- a/include/common.h +++ b/include/common.h @@ -64,6 +64,7 @@ typedef void (interrupt_handler_t)(void *);

/* startup functions, used in: * common/board_f.c + * common/init/board_init.c */ #include <init.h>

@@ -97,48 +98,11 @@ int run_command_list(const char *cmd, int len, int flag); /* arch/$(ARCH)/lib/board.c */ void board_init_r(gd_t *, ulong) __attribute__ ((noreturn));

-/** - * ulong board_init_f_alloc_reserve - allocate reserved area - * - * This function is called by each architecture very early in the start-up - * code to allow the C runtime to reserve space on the stack for writable - * 'globals' such as GD and the malloc arena. - * - * @top: top of the reserve area, growing down. - * @return: bottom of reserved area - */ -ulong board_init_f_alloc_reserve(ulong top); - -/** - * board_init_f_init_reserve - initialize the reserved area(s) - * - * This function is called once the C runtime has allocated the reserved - * area on the stack. It must initialize the GD at the base of that area. - * - * @base: top from which reservation was done - */ -void board_init_f_init_reserve(ulong base); - -/** - * arch_setup_gd() - Set up the global_data pointer - * - * This pointer is special in some architectures and cannot easily be assigned - * to. For example on x86 it is implemented by adding a specific record to its - * Global Descriptor Table! So we we provide a function to carry out this task. - * For most architectures this can simply be: - * - * gd = gd_ptr; - * - * @gd_ptr: Pointer to global data - */ -void arch_setup_gd(gd_t *gd_ptr); - int checkboard(void); int show_board_info(void); int checkflash(void); int checkdram(void); int last_stage_init(void); -extern ulong monitor_flash_len; int mac_read_from_eeprom(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ diff --git a/include/init.h b/include/init.h index f57a438..f952602 100644 --- a/include/init.h +++ b/include/init.h @@ -109,6 +109,45 @@ int misc_init_f(void); int embedded_dtb_select(void); #endif

+/* common/init/board_init.c */ +extern ulong monitor_flash_len; + +/** + * ulong board_init_f_alloc_reserve - allocate reserved area + * + * This function is called by each architecture very early in the start-up + * code to allow the C runtime to reserve space on the stack for writable + * 'globals' such as GD and the malloc arena. + * + * @top: top of the reserve area, growing down. + * @return: bottom of reserved area + */ +ulong board_init_f_alloc_reserve(ulong top); + +/** + * board_init_f_init_reserve - initialize the reserved area(s) + * + * This function is called once the C runtime has allocated the reserved + * area on the stack. It must initialize the GD at the base of that area. + * + * @base: top from which reservation was done + */ +void board_init_f_init_reserve(ulong base); + +/** + * arch_setup_gd() - Set up the global_data pointer + * + * This pointer is special in some architectures and cannot easily be assigned + * to. For example on x86 it is implemented by adding a specific record to its + * Global Descriptor Table! So we we provide a function to carry out this task. + * For most architectures this can simply be: + * + * gd = gd_ptr; + * + * @gd_ptr: Pointer to global data + */ +void arch_setup_gd(gd_t *gd_ptr); + /* common/board_r.c */

#endif /* __ASSEMBLY__ */

Move function prototypes used in common/board_r.c from common.h to init.h

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---

Changes in v2: None

include/common.h | 17 +---------------- include/init.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/include/common.h b/include/common.h index 62630db..7d181da 100644 --- a/include/common.h +++ b/include/common.h @@ -65,6 +65,7 @@ typedef void (interrupt_handler_t)(void *); /* startup functions, used in: * common/board_f.c * common/init/board_init.c + * common/board_r.c */ #include <init.h>

@@ -95,21 +96,13 @@ int run_command_repeatable(const char *cmd, int flag); */ int run_command_list(const char *cmd, int len, int flag);

-/* arch/$(ARCH)/lib/board.c */ -void board_init_r(gd_t *, ulong) __attribute__ ((noreturn)); - int checkboard(void); int show_board_info(void); int checkflash(void); int checkdram(void); -int last_stage_init(void); -int mac_read_from_eeprom(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ -int set_cpu_clk_info(void); int mdm_init(void); -int update_flash_size(int flash_size); -int arch_early_init_r(void);

/* * setup_board_extra() - Fill in extra details in the bd_t structure @@ -263,14 +256,8 @@ int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf); #endif int get_env_id (void);

-void pci_init (void); void pci_init_board(void);

-int misc_init_r (void); -#if defined(CONFIG_VID) -int init_func_vid(void); -#endif - /* common/exports.c */ void jumptable_init(void);

@@ -396,8 +383,6 @@ int get_clocks (void); ulong get_bus_freq (ulong); int get_serial_clock(void);

-int cpu_init_r (void); - /* $(CPU)/interrupts.c */ int interrupt_init (void); void timer_interrupt (struct pt_regs *); diff --git a/include/init.h b/include/init.h index f952602..89e48f2 100644 --- a/include/init.h +++ b/include/init.h @@ -149,6 +149,20 @@ void board_init_f_init_reserve(ulong base); void arch_setup_gd(gd_t *gd_ptr);

/* common/board_r.c */ +void board_init_r(gd_t *id, ulong dest_addr) __attribute__ ((noreturn)); + +int cpu_init_r(void); +int last_stage_init(void); +int mac_read_from_eeprom(void); +int set_cpu_clk_info(void); +int update_flash_size(int flash_size); +int arch_early_init_r(void); +void pci_init(void); +int misc_init_r(void); +#if defined(CONFIG_VID) +int init_func_vid(void); +#endif +

#endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */

Move function prototype for common/init/board_init.c from common.h to init.h

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---

Changes in v2: None

include/common.h | 3 +-- include/init.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/common.h b/include/common.h index 7d181da..a0633f3 100644 --- a/include/common.h +++ b/include/common.h @@ -66,6 +66,7 @@ typedef void (interrupt_handler_t)(void *); * common/board_f.c * common/init/board_init.c * common/board_r.c + * common/board_info.c */ #include <init.h>

@@ -96,8 +97,6 @@ int run_command_repeatable(const char *cmd, int flag); */ int run_command_list(const char *cmd, int len, int flag);

-int checkboard(void); -int show_board_info(void); int checkflash(void); int checkdram(void); extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ diff --git a/include/init.h b/include/init.h index 89e48f2..d54d519 100644 --- a/include/init.h +++ b/include/init.h @@ -163,6 +163,9 @@ int misc_init_r(void); int init_func_vid(void); #endif

+/* common/board_info.c */ +int checkboard(void); +int show_board_info(void);

#endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */

Merge init_helpers.h in the new file init.h with only prototypes for init_cache_f_r used in common/board_f.c

Signed-off-by: Patrick Delaunay patrick.delaunay@st.com --- modification introduced after Tom Rimi review of V1

Changes in v2: None

arch/x86/lib/spl.c | 1 - common/board_f.c | 1 - common/board_r.c | 1 - include/init.h | 7 +++++++ include/init_helpers.h | 18 ------------------ 5 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 include/init_helpers.h

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 832a5d7..7c32245 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -6,7 +6,6 @@

#include <common.h> #include <debug_uart.h> -#include <init_helpers.h> #include <spl.h> #include <asm/cpu.h> #include <asm/mtrr.h> diff --git a/common/board_f.c b/common/board_f.c index 4df52f1..62588c5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -18,7 +18,6 @@ #include <fs.h> #include <i2c.h> #include <initcall.h> -#include <init_helpers.h> #include <malloc.h> #include <mapmem.h> #include <os.h> diff --git a/common/board_r.c b/common/board_r.c index 482f506..89f2e16 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,7 +23,6 @@ #include <fdtdec.h> #include <ide.h> #include <initcall.h> -#include <init_helpers.h> #ifdef CONFIG_PS2KBD #include <keyboard.h> #endif diff --git a/include/init.h b/include/init.h index d54d519..147ae6b 100644 --- a/include/init.h +++ b/include/init.h @@ -101,6 +101,13 @@ int dram_init_banksize(void); */ int arch_reserve_stacks(void);

+/** + * init_cache_f_r() - Turn on the cache in preparation for relocation + * + * @return 0 if OK, -ve on error + */ +int init_cache_f_r(void); + int print_cpuinfo(void); int timer_init(void); int reserve_mmu(void); diff --git a/include/init_helpers.h b/include/init_helpers.h deleted file mode 100644 index 3efcfdd..0000000 --- a/include/init_helpers.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * (C) Copyright 2011 - * Graeme Russ, graeme.russ@gmail.com - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _INIT_HELPERS_H_ -#define _INIT_HELPERS_H_ - -/** - * init_cache_f_r() - Turn on the cache in preparation for relocation - * - * @return 0 if OK, -ve on error - */ -int init_cache_f_r(void); - -#endif /* _INIT_HELPERS_H_ */