From 5bfce27a42aaa5c5144bd9d4e8f8d4b222dbaec3 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Mon, 4 Jul 2016 11:06:23 +0800 Subject: p5020: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Zhenhua Luo --- conf/machine/p5020ds-64b.conf | 7 +++---- conf/machine/p5020ds.conf | 8 ++++---- 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" -- cgit v1.2.3-54-g00ecf