Merge tag 'fsl-qoriq-for-v2019.01-rc2' of git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / freescale / ls1043ardb / ddr.c

diff --git a/board/freescale/ls1043ardb/ddr.c b/board/freescale/ls1043ardb/ddr.c
index 7bc0f568ffbe90e1691a51415aab84b87291ba60..784e482f32fb3b8213b034df73eea518ffc8e617 100644 (file)
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/freescale/ls1043ardb/ddr.c
@@ -205,6 +205,19 @@ phys_size_t fixed_sdram(void)
 }
 #endif
 
+#ifdef CONFIG_TFABOOT
+int fsl_initdram(void)
+{
+       gd->ram_size = tfa_get_dram_size();
+       if (!gd->ram_size)
+#ifdef CONFIG_SYS_DDR_RAW_TIMING
+               gd->ram_size = fsl_ddr_sdram_size();
+#else
+               gd->ram_size = 0x80000000;
+#endif
+               return 0;
+}
+#else
 int fsl_initdram(void)
 {
        phys_size_t dram_size;
@@ -236,3 +249,4 @@ int fsl_initdram(void)
 
        return 0;
 }
+#endif