1 files changed, 12 insertions, 4 deletions

diff --git a/conf/machine/t1040d4rdb.conf b/conf/machine/t1040d4rdb.conf
index 0872cfe1..539765fa 100644
--- a/conf/machine/t1040d4rdb.conf
+++ b/conf/machine/t1040d4rdb.conf
@@ -1,18 +1,26 @@
 #@TYPE: Machine
 #@NAME: Freescale T1040D4RDB
 #@SOC: t1040
-#@DESCRIPTION: Machine configuration for running T1040D4RDB in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T1040D4 Reference
+#              Design Board with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "t1:t1040"
-UBOOT_MACHINES ?= "T1040D4RDB T1040D4RDB_NAND T1040D4RDB_SDCARD \
-    T1040D4RDB_SPIFLASH T1040D4RDB_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor nand sdcard spi secure-boot"
+UBOOT_CONFIG[nor] = "T1040D4RDB_config"
+UBOOT_CONFIG[nand] = "T1040D4RDB_NAND_config"
+UBOOT_CONFIG[sdcard] = "T1040D4RDB_SDCARD_config"
+UBOOT_CONFIG[spi] = "T1040D4RDB_SPIFLASH_config"
+UBOOT_CONFIG[secure-boot] = "T1040D4RDB_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t1040d4rdb.dtb t1040d4rdb-usdpaa-lag.dtb"
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_fmanv3l_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
 QE_UCODE = "iram_Type_A_T1040_r1.0.bin"
+
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg qe-ucode"