1 files changed, 13 insertions, 3 deletions

diff --git a/conf/machine/p1021rdb.conf b/conf/machine/p1021rdb.conf
index 03a1821..f587d46 100644
--- a/conf/machine/p1021rdb.conf
+++ b/conf/machine/p1021rdb.conf
@@ -1,17 +1,27 @@
 #@TYPE: Machine
 #@Name: Freescale P1021RDB
 #@SOC: p1021
-#@DESCRIPTION: Machine configuration for running P1021RDB
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P1021 Reference
+#              Design Board, revC with ppce500v2 core
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e500v2.inc
 
 SOC_FAMILY = "p1021"
 BOOTFORMAT_CONFIG = "config_sram_p1022ds.dat"
-UBOOT_MACHINES ?= "P1021RDB-PC P1021RDB-PC_NAND P1021RDB-PC_SDCARD P1021RDB-PC_SPIFLASH P1021RDB-PC_36BIT P1021RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_NAND P1021RDB-PC_36BIT_SDCARD"
+UBOOT_CONFIG ??= "nand sdcard spi 36bit-nor 36bit-spi 36bit-nand 36bit-sdcard nor"
+UBOOT_CONFIG[nor] = "P1021RDB-PC_config"
+UBOOT_CONFIG[nand] = "P1021RDB-PC_NAND_config"
+UBOOT_CONFIG[sdcard] = "P1021RDB-PC_SDCARD_config"
+UBOOT_CONFIG[spi] = "P1021RDB-PC_SPIFLASH_config"
+UBOOT_CONFIG[36bit-nor] = "P1021RDB-PC_36BIT_config"
+UBOOT_CONFIG[36bit-spi] = "P1021RDB-PC_36BIT_SPIFLASH_config"
+UBOOT_CONFIG[36bit-nand] = "P1021RDB-PC_36BIT_NAND_config"
+UBOOT_CONFIG[36bit-sdcard] = "P1021RDB-PC_36BIT_SDCARD_config"
+
 KERNEL_DEVICETREE ?= "p1021rdb-pc_32b.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x20000"
 QE_UCODE ?= "fsl_qe_ucode_1021_10_A.bin"
-
+EXTRA_IMAGEDEPENDS += "qe-ucode"