Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxi: move non-essential code out of s_init()

Browse source 
So far all Allwinner based boards were doing some not-so-lowlevel-setup
in lowlevel's s_init() routine.
This includes the initial clock, timer and pinmux setup, among other
things. This is clearly out of the "absolute bare minimum to get started"
scope that lowlevel_init.S suggests for this function.

Since we have an SPL, which is called right after s_init(), move those
calls to our board_init_f() function. As we overwrite this only for
the SPL, this has the added benefit of not doing this setup *again*
shortly afterwards, when running U-Boot proper.

This makes gpio_init() to be called from the SPL only, so pull this code
into a CONFIG_SPL_BUILD protected part to avoid build warnings.

Reviewed-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara 2022-01-22 10:05:12 +00:00
parent 006fddde01
commit 5bc4cd05d7
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
arch/arm/mach-sunxi/board.c
View file

@ -75,6 +75,7 @@ ulong board_get_usable_ram_top(ulong total_size)
} }
#endif #endif
#ifdef CONFIG_SPL_BUILD
static int gpio_init(void) static int gpio_init(void)
{ {
__maybe_unused uint val; __maybe_unused uint val;
@ -172,7 +173,6 @@ static int gpio_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_BOARD_LOAD_IMAGE) && defined(CONFIG_SPL_BUILD)
static int spl_board_load_image(struct spl_image_info *spl_image, static int spl_board_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev) struct spl_boot_device *bootdev)
{ {
@ -227,18 +227,6 @@ void s_init(void)
"mcr p15, 0, r0, c1, c0, 1\n" "mcr p15, 0, r0, c1, c0, 1\n"
::: "r0"); ::: "r0");
#endif #endif
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3
/* Enable non-secure access to some peripherals */
tzpc_init();
#endif
clock_init();
timer_init();
gpio_init();
#if !CONFIG_IS_ENABLED(DM_I2C)
i2c_init_board();
#endif
eth_init_board();
} }
#define SUNXI_INVALID_BOOT_SOURCE -1 #define SUNXI_INVALID_BOOT_SOURCE -1
@ -335,11 +323,22 @@ u32 spl_boot_device(void)
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_H3
/* Enable non-secure access to some peripherals */
tzpc_init();
#endif
clock_init();
timer_init();
gpio_init();
eth_init_board();
spl_init(); spl_init();
preloader_console_init(); preloader_console_init();
#if CONFIG_IS_ENABLED(I2C) && CONFIG_IS_ENABLED(SYS_I2C_LEGACY) #if CONFIG_IS_ENABLED(I2C) && CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
/* Needed early by sunxi_board_init if PMU is enabled */ /* Needed early by sunxi_board_init if PMU is enabled */
i2c_init_board();
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif #endif
sunxi_board_init(); sunxi_board_init();