[meta-freescale] [meta-fsl-arm][PATCH 08/41] ls1021atwr: update machine file

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at freescale.com>

* build multiple u-boot binaries
* support QSPI and IFC in SD boot
* define KERNEL_DEFCONFIG
* add rcw and qe-ucode as EXTRA_IMAGEDEPENDS

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/ls1021atwr.conf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 562ae96..dfe09fe 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -1,7 +1,8 @@
 #@TYPE: Machine
 #@NAME: Freescale LS1021ATWR board
 #@SOC: ls102xa
-#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ LS1 Tower System
+#              Module Rev2.0 with ARM Cortex-A7 core
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo at freescale.com>
 
 require conf/machine/include/qoriq-arm.inc
@@ -11,9 +12,10 @@ DEFAULTTUNE = "cortexa7hf-neon"
 
 SOC_FAMILY = "ls102xa"
 
-UBOOT_CONFIG ??= "nor"
+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"
@@ -21,9 +23,11 @@ UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_config"
 UBOOT_ENTRYPOINT = "0x80008000"
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
 
+KERNEL_DEFCONFIG ?= "${S}/arch/arm/configs/ls1021a_defconfig"
 KERNEL_DEVICETREE ?= "ls1021a-twr.dtb"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1 115200;ttyEHV0 115200;ttyLP0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
-USE_VT ?= "0"
 
+EXTRA_IMAGEDEPENDS += "rcw qe-ucode"
+USE_VT ?= "0"
-- 
1.9.2