path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
diff options
authorTom Rini <>2014-12-19 16:53:24 -0500
committerTom Rini <>2015-01-16 14:52:52 -0500
commita6b541b09022acb6f7c2754100ae26bd44eed1d9 (patch)
treecd3f71bd852e2bd29241528d4c68960ea30b21af /arch/arm/cpu/armv7/omap-common/boot-common.c
parentab77f24119e80257de4ab017b877f92f96980562 (diff)
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: Tom Rini <> Tested-by: Simon Glass <> Reviewed-by: Simon Glass <>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 00a108212a..17500f2315 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -106,6 +106,16 @@ u32 spl_boot_mode(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();
OpenPOWER on IntegriCloud