p5040: switch to new UBOOT_CONFIG format

Signed-off-by: Ting Liu <ting.liu@nxp.com>
Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>

2 files changed, 6 insertions, 8 deletions

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 7cc9b0f..74f6f52 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -10,16 +10,15 @@ require conf/machine/include/e5500-64b.inc
 SOC_FAMILY = "p5040"
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config"
-UBOOT_CONFIG[nand] = "P5040DS_NAND_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
 UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
-UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
-UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
 KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \
     fsl/p5040ds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
 USE_VT ?= "0"
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index d361bff..b9f8ce7 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -10,16 +10,15 @@ require conf/machine/include/e5500.inc
 SOC_FAMILY = "p5040"
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5040DS_config"
-UBOOT_CONFIG[nand] = "P5040DS_NAND_config"
+UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
 UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
-UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"
-UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
 KERNEL_DEVICETREE ?= "fsl/p5040ds.dtb fsl/p5040ds-usdpaa.dtb \
     fsl/p5040ds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
 USE_VT ?= "0"