From 333ed936271f7dbaa0720d42ec4a3bdb8efa3d88 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 16 Jul 2016 00:35:55 +0800 Subject: [PATCH] p5040: switch to new UBOOT_CONFIG format Signed-off-by: Ting Liu Signed-off-by: Otavio Salvador --- conf/machine/p5040ds-64b.conf | 10 ++++------ conf/machine/p5040ds.conf | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index de76d939..45d82f61 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf @@ -9,12 +9,12 @@ require conf/machine/include/e5500-64b.inc SOC_FAMILY = "p5040" -UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" +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 \ @@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.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/p5040ds.conf b/conf/machine/p5040ds.conf index 77132ede..77947365 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf @@ -9,12 +9,12 @@ require conf/machine/include/e5500.inc SOC_FAMILY = "p5040" -UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi" +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 \ @@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \ KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig" JFFS2_ERASEBLOCK = "0x10000" - EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg" - USE_VT ?= "0" -- 2.40.1