aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@nxp.com>2016-07-04 11:06:23 +0800
committerZhenhua Luo <zhenhua.luo@nxp.com>2016-07-04 11:06:23 +0800
commit5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3 (patch)
treeb53b016e98353c3ae63bda82299be83c70c3fcec
parentcd9f1c9a1bcbbbf82575aed93f6e356ddbd86711 (diff)
downloadmeta-fsl-ppc-5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3.tar.gz
meta-fsl-ppc-5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3.tar.bz2
meta-fsl-ppc-5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3.zip
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>
-rw-r--r--conf/machine/p5020ds-64b.conf7
-rw-r--r--conf/machine/p5020ds.conf8
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[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
+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[spi] = "P5020DS_SPIFLASH_config"
+UBOOT_CONFIG[sdcard] = "P5020DS_SDCARD_config,,u-boot.pbl"
+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"