diff mbox

[U-Boot,v1] arm: ls102xa: Fix SD/NAND/QSPI boot defination error for QE support

Message ID 1418117869-43483-1-git-send-email-b18965@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Alison Wang Dec. 9, 2014, 9:37 a.m. UTC
The SD/NAND/QSPI boot definations are wrong for QE support, this
patch is to fix this error.

Signed-off-by: Alison Wang <alison.wang@freescale.com>
---
 include/configs/ls1021aqds.h | 3 ++-
 include/configs/ls1021atwr.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

York Sun Dec. 11, 2014, 7:04 p.m. UTC | #1
On 12/09/2014 01:37 AM, Alison Wang wrote:
> The SD/NAND/QSPI boot definations are wrong for QE support, this
> patch is to fix this error.
> 
> Signed-off-by: Alison Wang <alison.wang@freescale.com>
> ---

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

York
diff mbox

Patch

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index f906215..6a6f620 100644
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -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
 
diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index db93201..9a497a6 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -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