ls1021atwr: support QSPI and IFC in SD boot

QSPI and IFC are both supported in SD boot. Build two SD boot images,
one supports IFC; the other supports QSPI.

Signed-off-by: Ting Liu <ting.liu@nxp.com>>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 8a6dd49a6850a50e2728a8d9d708789e39f23e45..eb035633dc56d714164b48ec9fec292a786b179b 100644 (file)
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -2,7 +2,7 @@
 #@NAME: Freescale LS1021ATWR board
 #@SOC: ls102xa
 #@DESCRIPTION: Machine configuration for Freescale QorIQ LS1 Tower System
-#              Module Rev1.0 with ARM Cortex-A7 core
+#              Module Rev2.0 with ARM Cortex-A7 core
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
 
 require conf/machine/include/qoriq-arm.inc
@@ -10,9 +10,10 @@ require conf/machine/include/tune-cortexa7.inc
 
 SOC_FAMILY = "ls102xa"
 
-UBOOT_CONFIG ??= "nor sdcard lpuart qspi"
+UBOOT_CONFIG ??= "sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
 UBOOT_CONFIG[nor] = "ls1021atwr_nor_config"
-UBOOT_CONFIG[sdcard] = "ls1021atwr_sdcard_config,sdcard"
+UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_config"
+UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_config"
 UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_config"
 UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_config"
 UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"