Commit a6b541b0 authored by Tom Rini's avatar Tom Rini

TI ARMv7: Don't use GD before crt0.S has set it

Prior to this change we set the gd pointer early so that we can store
data in it.  This becomes problematic for DM changes as well as being
odd in general.  Re-work the code paths so that we don't need to set the
gd pointer so early and instead can rely upon the normal setting of it.

In order to do this we do need to move certain calls from s_init into
spl_board_init(), mainly preloader_console_init and
save_omap_boot_params.

Tested on: Beaglebone Black, AM43xx GP EVM, Beagleboard, Beagleboard xM,
OMAP5 uEVM, DRA7xx EVM
Signed-off-by: default avatarTom Rini <trini@ti.com>
Tested-by: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
parent ab77f241
...@@ -284,14 +284,6 @@ void s_init(void) ...@@ -284,14 +284,6 @@ void s_init(void)
*/ */
#ifdef CONFIG_NOR_BOOT #ifdef CONFIG_NOR_BOOT
enable_norboot_pin_mux(); enable_norboot_pin_mux();
#endif
/*
* Save the boot parameters passed from romcode.
* We cannot delay the saving further than this,
* to prevent overwrites.
*/
#ifdef CONFIG_SPL_BUILD
save_omap_boot_params();
#endif #endif
watchdog_disable(); watchdog_disable();
set_uart_mux_conf(); set_uart_mux_conf();
...@@ -301,9 +293,6 @@ void s_init(void) ...@@ -301,9 +293,6 @@ void s_init(void)
gd->baudrate = CONFIG_BAUDRATE; gd->baudrate = CONFIG_BAUDRATE;
serial_init(); serial_init();
gd->have_console = 1; gd->have_console = 1;
#elif defined(CONFIG_SPL_BUILD)
gd = &gdata;
preloader_console_init();
#endif #endif
#if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC) #if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC)
/* Enable RTC32K clock */ /* Enable RTC32K clock */
......
...@@ -106,6 +106,16 @@ u32 spl_boot_mode(void) ...@@ -106,6 +106,16 @@ u32 spl_boot_mode(void)
void spl_board_init(void) void spl_board_init(void)
{ {
/*
* Save the boot parameters passed from romcode.
* We cannot delay the saving further than this,
* to prevent overwrites.
*/
save_omap_boot_params();
/* Prepare console output */
preloader_console_init();
#ifdef CONFIG_SPL_NAND_SUPPORT #ifdef CONFIG_SPL_NAND_SUPPORT
gpmc_init(); gpmc_init();
#endif #endif
......
...@@ -111,14 +111,6 @@ int arch_cpu_init(void) ...@@ -111,14 +111,6 @@ int arch_cpu_init(void)
*/ */
void s_init(void) void s_init(void)
{ {
/*
* Save the boot parameters passed from romcode.
* We cannot delay the saving further than this,
* to prevent overwrites.
*/
#ifdef CONFIG_SPL_BUILD
save_omap_boot_params();
#endif
init_omap_revision(); init_omap_revision();
hw_data_init(); hw_data_init();
...@@ -133,9 +125,6 @@ void s_init(void) ...@@ -133,9 +125,6 @@ void s_init(void)
srcomp_enable(); srcomp_enable();
setup_clocks_for_console(); setup_clocks_for_console();
gd = &gdata;
preloader_console_init();
do_io_settings(); do_io_settings();
#endif #endif
prcm_init(); prcm_init();
......
...@@ -119,6 +119,7 @@ int board_mmc_init(bd_t *bis) ...@@ -119,6 +119,7 @@ int board_mmc_init(bd_t *bis)
void spl_board_init(void) void spl_board_init(void)
{ {
preloader_console_init();
#if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT) #if defined(CONFIG_SPL_NAND_SUPPORT) || defined(CONFIG_SPL_ONENAND_SUPPORT)
gpmc_init(); gpmc_init();
#endif #endif
...@@ -264,14 +265,6 @@ void s_init(void) ...@@ -264,14 +265,6 @@ void s_init(void)
ehci_clocks_enable(); ehci_clocks_enable();
#endif #endif
#ifdef CONFIG_SPL_BUILD
gd = &gdata;
preloader_console_init();
timer_init();
#endif
if (!in_sdram) if (!in_sdram)
mem_init(); mem_init();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment