1 files changed, 11 insertions, 4 deletions

diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 534b5da28..a56e8a356 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -1,15 +1,21 @@
 #@TYPE: Machine
 #@NAME: Freescale P5040DS
 #@SOC: p5040
-#@DESCRIPTION: Machine configuration for running P5040DS in 32-bit mode 
+#@DESCRIPTION: Machine configuration for Freescale QorIQ P5040 Development
+#              System with ppce5500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "p5040"
-UBOOT_MACHINES ?= "P5040DS P5040DS_NAND P5040DS_SECURE_BOOT \
-    P5040DS_SDCARD P5040DS_SPIFLASH \
-"
+
+UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"
+UBOOT_CONFIG[nor] = "P5040DS_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config"
+UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+
 KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +23,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"