1 files changed, 25 insertions, 11 deletions

diff --git a/conf/machine/bsc9132qds.conf b/conf/machine/bsc9132qds.conf
index 90ac2a3b..1a2e1438 100644
--- a/conf/machine/bsc9132qds.conf
+++ b/conf/machine/bsc9132qds.conf
@@ -1,23 +1,37 @@
 #@TYPE: Machine
 #@NAME: Freescale BSC9132QDS
 #@SOC: bsc9132
-#@DESCRIPTION: Machine configuration for running BSC9132QDS
+#@DESCRIPTION: Machine configuration for Freescale QorIQ Qonverge BSC9132
+#              Qonverge Development System with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
 
 SOC_FAMILY = "bsc9132"
-UBOOT_MACHINES ?= " BSC9132QDS_NAND_DDRCLK133 BSC9132QDS_NAND_DDRCLK100 \
-    BSC9132QDS_NOR_DDRCLK100 BSC9132QDS_NOR_DDRCLK133 \
-    BSC9132QDS_SDCARD_DDRCLK100 BSC9132QDS_SDCARD_DDRCLK133 \
-    BSC9132QDS_SPIFLASH_DDRCLK100 BSC9132QDS_SPIFLASH_DDRCLK133 \
-    BSC9132QDS_NAND_DDRCLK100_SECURE BSC9132QDS_NAND_DDRCLK133_SECURE \
-    BSC9132QDS_NOR_DDRCLK100_SECURE BSC9132QDS_NOR_DDRCLK133_SECURE \
-    BSC9132QDS_SDCARD_DDRCLK100_SECURE BSC9132QDS_SDCARD_DDRCLK133_SECURE \
-    BSC9132QDS_SPIFLASH_DDRCLK100_SECURE BSC9132QDS_SPIFLASH_DDRCLK133_SECURE \
-"
+
+UBOOT_CONFIG ??= "nand-ddrclk133 nand-ddrclk100 nor-ddrclk100 nor-ddrclk133 \
+sdcard-ddrclk100 sdcard-ddrclk133 spi-ddrclk100 spi-ddrclk133 \
+nand-ddrclk100-secure nand-ddrclk133-secure nor-ddrclk100-secure \
+nor-ddrclk133-secure sdcard-ddrclk100-secure sdcard-ddrclk133-secure \
+spi-ddrclk100-secure spi-ddrclk133-secure"
+UBOOT_CONFIG[nand-ddrclk133] = "BSC9132QDS_NAND_DDRCLK133_config"
+UBOOT_CONFIG[nand-ddrclk100] = "BSC9132QDS_NAND_DDRCLK100_config"
+UBOOT_CONFIG[nor-ddrclk100] = "BSC9132QDS_NOR_DDRCLK100_config"
+UBOOT_CONFIG[nor-ddrclk133] = "BSC9132QDS_NOR_DDRCLK133_config"
+UBOOT_CONFIG[sdcard-ddrclk100] = "BSC9132QDS_SDCARD_DDRCLK100_config"
+UBOOT_CONFIG[sdcard-ddrclk133] = "BSC9132QDS_SDCARD_DDRCLK133_config"
+UBOOT_CONFIG[spi-ddrclk100] = "BSC9132QDS_SPIFLASH_DDRCLK100_config"
+UBOOT_CONFIG[spi-ddrclk133] = "BSC9132QDS_SPIFLASH_DDRCLK133_config"
+UBOOT_CONFIG[nand-ddrclk100-secure] = "BSC9132QDS_NAND_DDRCLK100_SECURE_config"
+UBOOT_CONFIG[nand-ddrclk133-secure] = "BSC9132QDS_NAND_DDRCLK133_SECURE_config"
+UBOOT_CONFIG[nor-ddrclk100-secure] = "BSC9132QDS_NOR_DDRCLK100_SECURE_config"
+UBOOT_CONFIG[nor-ddrclk133-secure] = "BSC9132QDS_NOR_DDRCLK133_SECURE_config"
+UBOOT_CONFIG[sdcard-ddrclk100-secure] = "BSC9132QDS_SDCARD_DDRCLK100_SECURE_config"
+UBOOT_CONFIG[sdcard-ddrclk133-secure] = "BSC9132QDS_SDCARD_DDRCLK133_SECURE_config"
+UBOOT_CONFIG[spi-ddrclk100-secure] = "BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_config"
+UBOOT_CONFIG[spi-ddrclk133-secure] = "BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_config"
+
 KERNEL_DEVICETREE ?= "bsc9132qds.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/85xx/bsc913x_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-