2 files changed, 8 insertions, 12 deletions
diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf
index de76d9390..45d82f61c 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[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
-UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+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 77132ede7..779473655 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[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
-UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"
+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"

diff --git a/conf/machine/p5040ds-64b.conf b/conf/machine/p5040ds-64b.conf index de76d9390..45d82f61c 100644 --- a/conf/machine/p5040ds-64b.conf +++ b/conf/machine/p5040ds-64b.conf
@@ -9,12 +9,12 @@ require conf/machine/include/e5500-64b.inc
9		9
10	SOC_FAMILY = "p5040"	10	SOC_FAMILY = "p5040"
11		11
12	UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"	12	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
13	UBOOT_CONFIG[nor] = "P5040DS_config"	13	UBOOT_CONFIG[nor] = "P5040DS_config"
14	UBOOT_CONFIG[nand] = "P5040DS_NAND_config"	14	UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
15	UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"	15	UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
16	UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"	16	UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
17	UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"	17	UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
18		18
19	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \	19	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
20	p5040ds-usdpaa-shared-interfaces.dtb \	20	p5040ds-usdpaa-shared-interfaces.dtb \
@@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
22	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"	22	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet64_smp_defconfig"
23		23
24	JFFS2_ERASEBLOCK = "0x10000"	24	JFFS2_ERASEBLOCK = "0x10000"
25
26	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"	25	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
27
28	USE_VT ?= "0"	26	USE_VT ?= "0"


diff --git a/conf/machine/p5040ds.conf b/conf/machine/p5040ds.conf index 77132ede7..779473655 100644 --- a/conf/machine/p5040ds.conf +++ b/conf/machine/p5040ds.conf
@@ -9,12 +9,12 @@ require conf/machine/include/e5500.inc
9		9
10	SOC_FAMILY = "p5040"	10	SOC_FAMILY = "p5040"
11		11
12	UBOOT_CONFIG ??= "nor nand secure-boot sdcard spi"	12	UBOOT_CONFIG ??= "nand secure-boot sdcard spi nor"
13	UBOOT_CONFIG[nor] = "P5040DS_config"	13	UBOOT_CONFIG[nor] = "P5040DS_config"
14	UBOOT_CONFIG[nand] = "P5040DS_NAND_config"	14	UBOOT_CONFIG[nand] = "P5040DS_NAND_config,,u-boot.pbl"
15	UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"	15	UBOOT_CONFIG[secure-boot] = "P5040DS_SECURE_BOOT_config"
16	UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config"	16	UBOOT_CONFIG[sdcard] = "P5040DS_SDCARD_config,,u-boot.pbl"
17	UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config"	17	UBOOT_CONFIG[spi] = "P5040DS_SPIFLASH_config,,u-boot.pbl"
18		18
19	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \	19	KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
20	p5040ds-usdpaa-shared-interfaces.dtb \	20	p5040ds-usdpaa-shared-interfaces.dtb \
@@ -22,7 +22,5 @@ KERNEL_DEVICETREE ?= "p5040ds.dtb p5040ds-usdpaa.dtb \
22	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"	22	KERNEL_DEFCONFIG ?= "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
23		23
24	JFFS2_ERASEBLOCK = "0x10000"	24	JFFS2_ERASEBLOCK = "0x10000"
25
26	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"	25	EXTRA_IMAGEDEPENDS += "fm-ucode rcw hypervisor hv-cfg"
27
28	USE_VT ?= "0"	26	USE_VT ?= "0"