p5020: switch to new UBOOT_CONFIG format

Signed-off-by: Ting Liu <ting.liu@nxp.com> Signed-off-by: Zhenhua Luo <zhenhua.luo@nxp.com>
author: Ting Liu <ting.liu@nxp.com> 2016-07-04 11:06:23 +0800
committer: Zhenhua Luo <zhenhua.luo@nxp.com> 2016-07-04 11:06:23 +0800
commit: 5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3 (patch)
tree: b53b016e98353c3ae63bda82299be83c70c3fcec
parent: cd9f1c9a1bcbbbf82575aed93f6e356ddbd86711 (diff)
download: meta-fsl-ppc-5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3.tar.gz
2 files changed, 7 insertions, 8 deletions
diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf
index 851ea3a..17fe02b 100644
--- a/conf/machine/p5020ds-64b.conf
+++ b/conf/machine/p5020ds-64b.conf
@@ -10,17 +10,16 @@ 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[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
-UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
 KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
    fsl/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"
 USE_VT ?= "0"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 0972765..037a713 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -10,17 +10,17 @@ 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[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
-UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
 KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
    fsl/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"
 USE_VT ?= "0"
author	Ting Liu <ting.liu@nxp.com>	2016-07-04 11:06:23 +0800
committer	Zhenhua Luo <zhenhua.luo@nxp.com>	2016-07-04 11:06:23 +0800
commit	5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3 (patch)
tree	b53b016e98353c3ae63bda82299be83c70c3fcec
parent	cd9f1c9a1bcbbbf82575aed93f6e356ddbd86711 (diff)
download	meta-fsl-ppc-5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3.tar.gz

diff --git a/conf/machine/p5020ds-64b.conf b/conf/machine/p5020ds-64b.conf index 851ea3a..17fe02b 100644 --- a/conf/machine/p5020ds-64b.conf +++ b/conf/machine/p5020ds-64b.conf
@@ -10,17 +10,16 @@ require conf/machine/include/e5500-64b.inc
10	SOC_FAMILY = "p5020"	10	SOC_FAMILY = "p5020"
11	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"	11	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
12	UBOOT_CONFIG[nor] = "P5020DS_config"	12	UBOOT_CONFIG[nor] = "P5020DS_config"
13	UBOOT_CONFIG[nand] = "P5020DS_NAND_config"	13	UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
14	UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"	14	UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
15	UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"	15	UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
16	UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"	16	UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
17	KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \	17	KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
18	fsl/p5020ds-usdpaa-shared-interfaces.dtb \	18	fsl/p5020ds-usdpaa-shared-interfaces.dtb \
19	"	19	"
20	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"	20	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
21		21
22	JFFS2_ERASEBLOCK = "0x10000"	22	JFFS2_ERASEBLOCK = "0x10000"
23
24	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"	23	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
25		24
26	USE_VT ?= "0"	25	USE_VT ?= "0"


diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf index 0972765..037a713 100644 --- a/conf/machine/p5020ds.conf +++ b/conf/machine/p5020ds.conf
@@ -10,17 +10,17 @@ require conf/machine/include/e5500.inc
10	SOC_FAMILY = "p5020"	10	SOC_FAMILY = "p5020"
11	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"	11	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
12	UBOOT_CONFIG[nor] = "P5020DS_config"	12	UBOOT_CONFIG[nor] = "P5020DS_config"
13	UBOOT_CONFIG[nand] = "P5020DS_NAND_config"	13	UBOOT_CONFIG[nand] = "P5020DS_NAND_config,,u-boot.pbl"
14	UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"	14	UBOOT_CONFIG[secure-boot] = "P5020DS_SECURE_BOOT_config"
15	UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config"	15	UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
16	UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config"	16	UBOOT_CONFIG[spi] = "P5020DS_SPIFLASH_config,,u-boot.pbl"
		17
17	KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \	18	KERNEL_DEVICETREE ?= "fsl/p5020ds.dtb fsl/p5020ds-usdpaa.dtb \
18	fsl/p5020ds-usdpaa-shared-interfaces.dtb \	19	fsl/p5020ds-usdpaa-shared-interfaces.dtb \
19	"	20	"
20	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	21	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
21		22
22	JFFS2_ERASEBLOCK = "0x10000"	23	JFFS2_ERASEBLOCK = "0x10000"
23
24	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"	24	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
25		25
26	USE_VT ?= "0"	26	USE_VT ?= "0"