|
@@ -80,6 +80,30 @@ int esdhc_status_fixup(void *blob, const char *compat)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
+#ifdef CONFIG_TFABOOT
|
|
|
+int dram_init(void)
|
|
|
+{
|
|
|
+#ifdef CONFIG_TARGET_LS1012AFRWY
|
|
|
+ int board_rev;
|
|
|
+#endif
|
|
|
+
|
|
|
+ gd->ram_size = tfa_get_dram_size();
|
|
|
+
|
|
|
+ if (!gd->ram_size) {
|
|
|
+#ifdef CONFIG_TARGET_LS1012AFRWY
|
|
|
+ board_rev = get_board_version();
|
|
|
+
|
|
|
+ if (board_rev & BOARD_REV_C)
|
|
|
+ gd->ram_size = SYS_SDRAM_SIZE_1024;
|
|
|
+ else
|
|
|
+ gd->ram_size = SYS_SDRAM_SIZE_512;
|
|
|
+#else
|
|
|
+ gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
|
|
|
+#endif
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+#else
|
|
|
int dram_init(void)
|
|
|
{
|
|
|
#ifdef CONFIG_TARGET_LS1012AFRWY
|
|
@@ -122,6 +146,7 @@ int dram_init(void)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+#endif
|
|
|
|
|
|
int board_early_init_f(void)
|
|
|
{
|
|
@@ -139,7 +164,8 @@ int board_init(void)
|
|
|
* Set CCI-400 control override register to enable barrier
|
|
|
* transaction
|
|
|
*/
|
|
|
- out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
|
|
|
+ if (current_el() == 3)
|
|
|
+ out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
|
|
|
|
|
|
#ifdef CONFIG_ENV_IS_NOWHERE
|
|
|
gd->env_addr = (ulong)&default_environment[0];
|