[meta-freescale] [meta-fsl-ppc][PATCH 08/13] p5020: 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/p5020ds-64b.conf |  9 +++++----
 conf/machine/p5020ds.conf     | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index b02de94..a359130 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -8,17 +8,18 @@
 require conf/machine/include/e5500-64b.inc
 
 SOC_FAMILY = "p5020"
+
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5020DS_config"
-UBOOT_CONFIG[nand] = "P5020DS_NAND_config"
+UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
 UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
-UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
-UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
+
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 95be344..5249f28 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -8,18 +8,18 @@
 require conf/machine/include/e5500.inc
 
 SOC_FAMILY = "p5020"
+
 UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
 UBOOT_CONFIG[nor] = "P5020DS_config"
-UBOOT_CONFIG[nand] = "P5020DS_NAND_config"
+UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
 UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
-UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"
-UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
+
 KERNEL_DEVICETREE ?= "p5020ds.dtb p5020ds-usdpaa.dtb \
     p5020ds-usdpaa-shared-interfaces.dtb \
 "
 KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
 
 JFFS2_ERASEBLOCK = "0x10000"
-
-
 EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
-- 
1.9.2