p4080ds: switch to new UBOOT_CONFIG format

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 1bbe90533a36969ad741eddbb7db76d24a2daaf4..2e7b4d3ba1ca20487886088abfab2e9c9d688caf 100644 (file)
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -9,11 +9,11 @@ require conf/machine/include/e500mc.inc
 
 SOC_FAMILY = "p4080"
 
-UBOOT_CONFIG ??= "nor secure-boot sdcard spi"
+UBOOT_CONFIG ??= "secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P4080DS_config"
 UBOOT_CONFIG[secure-boot] = "P4080DS_SECURE_BOOT_config"
-UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config"
-UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P4080DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P4080DS_SPIFLASH_config,,u-boot.pbl"
 
 KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb \
     p4080ds-usdpaa-shared-interfaces.dtb \
@@ -21,7 +21,5 @@ KERNEL_DEVICETREE ?= "p4080ds.dtb p4080ds-usdpaa.dtb \
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-
 USE_VT ?= "0"