From: Faiz Abbas <faiz_abbas@ti.com>
Date: Fri, 19 Jan 2018 10:02:48 +0000 (+0530)
Subject: ARM: AM43XX: Call hw_data_init() again after relocation to update *ctrl
X-Git-Tag: v2018.03-rc1~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a93feb2edc60b9db76ec794bff5ad0fcb10ce3eb;p=oweals%2Fu-boot.git

ARM: AM43XX: Call hw_data_init() again after relocation to update *ctrl

hw_data_init() is called before relocation to initialise hardware data.
Since ctrl is initialized to OMAP_SRAM_SCRATCH_SYS_CTRL in
arch/arm/mach-omap2/am33xx/hw_data.c, the pointer *ctrl will not be
updated during relocation and will hold a stale value.

Therefore call hw_data_init() again after relocation to
reinitialize *ctrl.

Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---

diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 2c417e7545..16150ad30a 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -580,6 +580,11 @@ int board_init(void)
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 	gpmc_init();
 
+	/*
+	 * Call this to initialize *ctrl again
+	 */
+	hw_data_init();
+
 	/* Clear all important bits for DSS errata that may need to be tweaked*/
 	mreqprio_0 = readl(&cdev->mreqprio_0) & MREQPRIO_0_SAB_INIT1_MASK &
 	                   MREQPRIO_0_SAB_INIT0_MASK;