| Message ID | 20240327121153.2455126-3-lukas.funke-oss@weidmueller.com |
|---|---|
| State | New |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | Introduce spl_soc_init() for SoC specific initialization | expand |
On 3/27/24 13:11, lukas.funke-oss@weidmueller.com wrote: > From: Lukas Funke <lukas.funke@weidmueller.com> > > Rename spl_board_init() to spl_soc_init(). SoC specific > implementation should be separated from board specific implementation > in order to be extended by board developers. > > Signed-off-by: Lukas Funke <lukas.funke@weidmueller.com> > --- > > Changes in v3: > - Rephrase Kconfig description and correct minor typo > > Changes in v2: > - Change spl_arch_init() to spl_soc_init() > > arch/arm/Kconfig | 4 ++-- > arch/arm/mach-zynq/spl.c | 4 ++-- > arch/arm/mach-zynqmp/spl.c | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 01d6556c42..db56db9414 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1275,7 +1275,7 @@ config ARCH_ZYNQ > select OF_CONTROL > select MTD > select SPI > - select SPL_BOARD_INIT if SPL > + select SPL_SOC_INIT if SPL > select SPL_CLK if SPL > select SPL_DM if SPL > select SPL_DM_SPI if SPL > @@ -1318,7 +1318,7 @@ config ARCH_ZYNQMP > imply FIRMWARE > select GICV2 > select OF_CONTROL > - select SPL_BOARD_INIT if SPL > + select SPL_SOC_INIT if SPL > select SPL_CLK if SPL > select SPL_DM if SPL > select SPL_DM_SPI if SPI && SPL_DM > diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c > index fea1c9b12a..112b44e2e1 100644 > --- a/arch/arm/mach-zynq/spl.c > +++ b/arch/arm/mach-zynq/spl.c > @@ -32,8 +32,8 @@ void board_init_f(ulong dummy) > arch_cpu_init(); > } > > -#ifdef CONFIG_SPL_BOARD_INIT > -void spl_board_init(void) > +#ifdef CONFIG_SPL_SOC_INIT > +void spl_soc_init(void) > { > preloader_console_init(); > #if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA) > diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c > index a0f35f36fa..71f9932525 100644 > --- a/arch/arm/mach-zynqmp/spl.c > +++ b/arch/arm/mach-zynqmp/spl.c > @@ -56,8 +56,8 @@ static void ps_mode_reset(ulong mode) > # define MODE_RESET PS_MODE1 > #endif > > -#ifdef CONFIG_SPL_BOARD_INIT > -void spl_board_init(void) > +#ifdef CONFIG_SPL_SOC_INIT > +void spl_soc_init(void) > { > preloader_console_init(); > ps_mode_reset(MODE_RESET); Acked-by: Michal Simek <michal.simek@amd.com> Thanks, Michal
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01d6556c42..db56db9414 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1275,7 +1275,7 @@ config ARCH_ZYNQ select OF_CONTROL select MTD select SPI - select SPL_BOARD_INIT if SPL + select SPL_SOC_INIT if SPL select SPL_CLK if SPL select SPL_DM if SPL select SPL_DM_SPI if SPL @@ -1318,7 +1318,7 @@ config ARCH_ZYNQMP imply FIRMWARE select GICV2 select OF_CONTROL - select SPL_BOARD_INIT if SPL + select SPL_SOC_INIT if SPL select SPL_CLK if SPL select SPL_DM if SPL select SPL_DM_SPI if SPI && SPL_DM diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c index fea1c9b12a..112b44e2e1 100644 --- a/arch/arm/mach-zynq/spl.c +++ b/arch/arm/mach-zynq/spl.c @@ -32,8 +32,8 @@ void board_init_f(ulong dummy) arch_cpu_init(); } -#ifdef CONFIG_SPL_BOARD_INIT -void spl_board_init(void) +#ifdef CONFIG_SPL_SOC_INIT +void spl_soc_init(void) { preloader_console_init(); #if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA) diff --git a/arch/arm/mach-zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c index a0f35f36fa..71f9932525 100644 --- a/arch/arm/mach-zynqmp/spl.c +++ b/arch/arm/mach-zynqmp/spl.c @@ -56,8 +56,8 @@ static void ps_mode_reset(ulong mode) # define MODE_RESET PS_MODE1 #endif -#ifdef CONFIG_SPL_BOARD_INIT -void spl_board_init(void) +#ifdef CONFIG_SPL_SOC_INIT +void spl_soc_init(void) { preloader_console_init(); ps_mode_reset(MODE_RESET);