[meta-freescale] [meta-fsl-ppc][PATCH 09/13] p5040: switch to new UBOOT_CONFIG format

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 conf/machine/p5040ds-64b.conf | 8 +++++---
 conf/machine/p5040ds.conf     | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index 0ff19d3..32b4c3e 100644
--- a/conf/machine/p5040ds-64b.conf
+++ b/conf/machine/p5040ds-64b.conf
@@ -8,12 +8,14 @@
 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 ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "
diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf
index 48675ac..2ca3def 100644
--- a/conf/machine/p5040ds.conf
+++ b/conf/machine/p5040ds.conf
@@ -8,12 +8,14 @@
 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 ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
     p5040ds-usdpaa-shared-interfaces.dtb \
 "
-- 
1.9.2