Skip to contentSkip to conversation

arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support

PATCH New Alison Wang 2 participants 2 messages Dec 9, 2014 – Dec 11, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support

The SD/NAND/QSPI boot definations are wrong for QE support, this patch is to fix this error.

---
 include/configs/ls1021aqds.h | 3 ++-
 include/configs/ls1021atwr.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
include/configs/ls1021aqds.h +2 -1
index f906215..6a6f620 100644
@@ -104,7 +104,8 @@ unsigned long get_board_ddr_clk(void);
 
 #define CONFIG_FSL_CAAM			/* Enable CAAM */
 
-#if !defined(CONFIG_SDCARD) && !defined(CONFIG_NAND) && !defined(CONFIG_SPI)
+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
+	!defined(CONFIG_QSPI_BOOT)
 #define CONFIG_U_QE
 #endif
 
include/configs/ls1021atwr.h +2 -1
index db93201..9a497a6 100644
@@ -110,7 +110,8 @@
 
 #define CONFIG_FSL_CAAM			/* Enable CAAM */
 
-#if !defined(CONFIG_SDCARD) && !defined(CONFIG_NAND) && !defined(CONFIG_SPI)
+#if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
+	!defined(CONFIG_QSPI_BOOT)
 #define CONFIG_U_QE
 #endif
 
Signature · 1 line
2.1.0.27.g96db324
#1 lore raw

PATCH 1/1 arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support

Quoted 5 lines · Alison Wang

The SD/NAND/QSPI boot definations are wrong for QE support, this patch is to fix this error.

---

Applied to u-boot-fsl-qoriq master, awaiting upstream.

York