From: York Sun <york.sun@nxp.com>
Date: Fri, 8 Jun 2018 23:37:27 +0000 (-0700)
Subject: armv8: ls1046ardb: Enable IFC for SPL build
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=80bec96ecf3b99fa96c7e658af208eeaf3fe593f;p=u-boot.git

armv8: ls1046ardb: Enable IFC for SPL build

Commit a52ff334c5b1 ("armv8: ls1046ardb: SPL size reduction") reduced
image size for SPL. IFC was disabled. If PPA is loaded in SPL, MMU is
enabled as a result. Removing IFC skips IFC region in the MMU table,
causing later failure in RAM version U-boot when accessing CPLD
through IFC. Only disable IFC if PPA is not enabled for SPL.

Signed-off-by: York Sun <york.sun@nxp.com>
---

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 9d4422ad79..3abcd7bcf4 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -19,7 +19,9 @@
 #if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_NAND_BOOT))
 #define SPL_NO_MMC
 #endif
-#if (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT))
+#if defined(CONFIG_SPL_BUILD)		&& \
+	defined(CONFIG_SD_BOOT)		&& \
+	!defined(CONFIG_SPL_FSL_LS_PPA)
 #define SPL_NO_IFC
 #endif