summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Garg <sumit.garg@nxp.com>2017-09-11 08:37:26 (GMT)
committerAlison Wang <b18965@freescale.com>2017-09-13 05:39:20 (GMT)
commit85bfc58954f4a2aeed300524ad15ffe63d371b5d (patch)
tree4ef13182af24777105a86f2f75eb2b51b298b216
parent96cc4d72500150db31f062e296f9964e1e78a76e (diff)
downloadu-boot-85bfc58954f4a2aeed300524ad15ffe63d371b5d.tar.xz
ls1088aqds: Enable IFC and QIXIS in SPL image
Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
-rw-r--r--arch/arm/cpu/armv8/fsl-layerscape/soc.c2
-rw-r--r--board/freescale/ls1088a/ls1088a.c4
-rw-r--r--include/configs/ls1088a_common.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 42d6ad6..02a4308 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -329,7 +329,7 @@ void bypass_smmu(void)
void fsl_lsch3_early_init_f(void)
{
erratum_rcw_src();
-#ifndef CONFIG_SPL_BUILD
+#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_FSL_QIXIS)
init_early_memctl_regs(); /* tighten IFC timing */
#endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A009203
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index a2b9b68..8b1e592 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -34,7 +34,7 @@ int board_early_init_f(void)
return 0;
}
-#if !defined(CONFIG_SPL_BUILD)
+#ifdef CONFIG_FSL_QIXIS
unsigned long long get_qixis_addr(void)
{
unsigned long long addr;
@@ -52,7 +52,9 @@ unsigned long long get_qixis_addr(void)
return addr;
}
+#endif
+#if !defined(CONFIG_SPL_BUILD)
int checkboard(void)
{
char buf[64];
diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h
index 85118ec..fa59c10 100644
--- a/include/configs/ls1088a_common.h
+++ b/include/configs/ls1088a_common.h
@@ -88,7 +88,7 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#ifndef SPL_NO_IFC
+#if !defined(SPL_NO_IFC) || defined(CONFIG_TARGET_LS1088AQDS)
/* IFC */
#define CONFIG_FSL_IFC
#endif