6 files changed, 20 insertions, 9 deletions

diff --git a/conf/machine/p2041rdb.conf b/conf/machine/p2041rdb.conf
index 83dc852..014699e 100644
--- a/conf/machine/p2041rdb.conf
+++ b/conf/machine/p2041rdb.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P2041RDB"
+UBOOT_MACHINES = "P2041RDB P2041RDB_SECURE_BOOT P2041RDB_SDCARD P2041RDB_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p2041rdb.dts \
                         ${S}/arch/powerpc/boot/dts/p2041rdb-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/conf/machine/p3041ds.conf b/conf/machine/p3041ds.conf
index 8331292..2bdfb33 100644
--- a/conf/machine/p3041ds.conf
+++ b/conf/machine/p3041ds.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P3041DS"
+UBOOT_MACHINES = "P3041DS P3041DS_NAND P3041DS_SECURE_BOOT P3041DS_SRIOBOOT_MASTER P3041DS_SRIOBOOT_SLAVE P3041DS_SDCARD P3041DS_SPIFLASH"
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3041ds.dts \
                         ${S}/arch/powerpc/boot/dts/p3041ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/conf/machine/p3060qds.conf b/conf/machine/p3060qds.conf
index dd872c9..4cfc85e 100644
--- a/conf/machine/p3060qds.conf
+++ b/conf/machine/p3060qds.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P3060QDS"
+UBOOT_MACHINES = "P3060QDS P3060QDS_NAND P3060QDS_SECURE_BOOT "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p3060qds.dts \
                         ${S}/arch/powerpc/boot/dts/p3060qds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/conf/machine/p4080ds.conf b/conf/machine/p4080ds.conf
index 96d082c..66a9554 100644
--- a/conf/machine/p4080ds.conf
+++ b/conf/machine/p4080ds.conf
@@ -3,7 +3,7 @@
 
 require e500mc.inc
 
-UBOOT_MACHINES = "P4080DS"
+UBOOT_MACHINES = "P4080DS P4080DS_SECURE_BOOT P4080DS_SRIOBOOT_MASTER P4080DS_SRIOBOOT_SLAVE P4080DS_SDCARD P4080DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p4080ds.dts \
                         ${S}/arch/powerpc/boot/dts/p4080ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/conf/machine/p5020ds.conf b/conf/machine/p5020ds.conf
index 296fd4e..84de757 100644
--- a/conf/machine/p5020ds.conf
+++ b/conf/machine/p5020ds.conf
@@ -3,7 +3,7 @@
 
 require e5500.inc
 
-UBOOT_MACHINES = "P5020DS"
+UBOOT_MACHINES = "P5020DS P5020DS_NAND P5020DS_SECURE_BOOT P5020DS_SRIOBOOT_MASTER P5020DS_SRIOBOOT_SLAVE P5020DS_SDCARD P5020DS_SPIFLASH "
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p5020ds.dts \
                         ${S}/arch/powerpc/boot/dts/p5020ds-usdpaa.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/corenet32_smp_defconfig"
diff --git a/recipes-kernel/u-boot/u-boot_git.bb b/recipes-kernel/u-boot/u-boot_git.bb
index 50c89a9..6568a78 100644
--- a/recipes-kernel/u-boot/u-boot_git.bb
+++ b/recipes-kernel/u-boot/u-boot_git.bb
@@ -5,7 +5,7 @@ PROVIDES = "virtual/bootloader"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
-PR = "r11"
+PR = "r12"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "boot-format-native virtual/${TARGET_PREFIX}gcc"
 
@@ -44,13 +44,24 @@ do_compile () {
                 case "${board}" in
                 *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
                 *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
+                *NAND*)         UBOOT_TARGET="u-boot-nand";;
                 *)              UBOOT_TARGET="";;
                 esac
 
                 if [ "x${UBOOT_TARGET}" != "x" ]; then
-                        ${STAGING_BINDIR_NATIVE}/boot_format \
-                                ${STAGING_DATADIR_NATIVE}/${BOOTFORMAT_CONFIG} \
-                                ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
+                        if [ "${MACHINE_ARCH}" == "p1023rds" ] || \
+                                [ "${MACHINE_ARCH}" == "p2041rdb" ] || \
+                                [ "${MACHINE_ARCH}" == "p3041ds" ] || \
+                                [ "${MACHINE_ARCH}" == "p3060qds" ] || \
+                                [ "${MACHINE_ARCH}" == "p4080ds" ] || \
+                                [ "${MACHINE_ARCH}" == "p5020ds" ] || \
+                                [ "${MACHINE_ARCH}" == "p5020ds-64b" ]; then
+                                cp ${S}/${board}/u-boot.bin  ${S}/${board}/${UBOOT_TARGET}.bin
+                        else
+                                ${STAGING_BINDIR_NATIVE}/boot_format \
+                                        ${STAGING_DATADIR_NATIVE}/${BOOTFORMAT_CONFIG} \
+                                        ${S}/${board}/u-boot.bin -spi ${S}/${board}/${UBOOT_TARGET}.bin
+                        fi 
                 fi
         done
 }