1 files changed, 12 insertions, 4 deletions

diff --git a/conf/machine/t2080qds.conf b/conf/machine/t2080qds.conf
index 23b43ca3d..a80c70ddd 100644
--- a/conf/machine/t2080qds.conf
+++ b/conf/machine/t2080qds.conf
@@ -1,15 +1,22 @@
 #@TYPE: Machine
 #@NAME: Freescale T2080QDS
 #@SOC: t2080
-#@DESCRIPTION: Machine configuration for running T2080QDS in 32-bit mode
+#@DESCRIPTION: Machine configuration for Freescale QorIQ T2080 Development
+#              System with ppce6500 core in 32b mode
 #@MAINTAINER: Chunrong Guo <B40290@freescale.com>
 
 require conf/machine/include/e6500.inc
 
 SOC_FAMILY = "t2:t2080"
-UBOOT_MACHINES ?= "T2080QDS T2080QDS_SDCARD T2080QDS_SPIFLASH \
-    T2080QDS_NAND T2080QDS_SRIO_PCIE_BOOT T2080QDS_SECURE_BOOT \
-"
+
+UBOOT_CONFIG ??= "nor sdcard spi nand srio-pcie-boot secure-boot"
+UBOOT_CONFIG[nor] = "T2080QDS_config"
+UBOOT_CONFIG[sdcard] = "T2080QDS_SDCARD_config"
+UBOOT_CONFIG[spi] = "T2080QDS_SPIFLASH_config"
+UBOOT_CONFIG[nand] = "T2080QDS_NAND_config"
+UBOOT_CONFIG[srio-pcie-boot] = "T2080QDS_SRIO_PCIE_BOOT_config"
+UBOOT_CONFIG[secure-boot] = "T2080QDS_SECURE_BOOT_config"
+
 KERNEL_DEVICETREE ?= "t2080qds.dtb t2080qds-usdpaa.dtb \
     t2080qds-usdpaa-shared-interfaces.dtb \
 "
@@ -17,3 +24,4 @@ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_fmanv3h_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
 
+EXTRA_IMAGEDEPENDS += "fm-ucode rcw lib64-hypervisor hv-cfg"