u-boot: fixup building multiple images and add thsoe images for p1020rdb to start...

Signed-off-by: Matthew McClintock <msm@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/p1020rdb.conf b/meta-fsl-ppc/conf/machine/p1020rdb.conf
index 87ef1ce72bb36f3d9fcc51d61b4c29d4cee81466..1d046b4c575e78b15105c0467e72dac136062a64 100644 (file)
--- a/meta-fsl-ppc/conf/machine/p1020rdb.conf
+++ b/meta-fsl-ppc/conf/machine/p1020rdb.conf
@@ -3,6 +3,8 @@
 
 require e500v2.inc
 
-UBOOT_MACHINES = "P1020RDB"
+BOOTFORMAT_CONFIG = "config_ddr3_1gb_p1_p2_rdb_pc_667M.dat"
+UBOOT_MACHINES = "P1020RDB P1020RDB-PC P1020RDB-PC_SPIFLASH P1020RDB-PC_NAND P1020RDB-PC_SDCARD"
+
 KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1020rdb.dts"
 KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig"

diff --git a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
index 17097b0c61a529e7a60b19116e35b2e44051db31..25bc2e5133b60ccce8052bf6620b4ac096484f9c 100644 (file)
--- a/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
+++ b/meta-fsl-ppc/recipes-kernel/u-boot/u-boot_git.bb
@@ -42,8 +42,8 @@ do_compile () {
                oe_runmake O=${board} all
 
                case "${board}" in
-               *SDCARD*)       UBOOT_TARGET="u-bootx-sd";;
-               *SPIFLASH*)     UBOOT_TARGET="u-bootx-spi";;
+               *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+               *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
                *)              UBOOT_TARGET="";;
                esac
 
@@ -62,16 +62,16 @@ do_install(){
 
        for board in ${UBOOT_MACHINES}; do
                case "${board}" in
-               *SDCARD*)       UBOOT_TARGET="u-bootx-sd";;
-               *SPIFLASH*)     UBOOT_TARGET="u-bootx-spi";;
+               *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+               *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
                *NAND*)         UBOOT_TARGET="u-boot-nand";;
                *)              UBOOT_TARGET="u-boot";;
                esac
 
                if [ -f ${S}/${UBOOT_TARGET}.bin ]; then
                        mkdir -p ${D}/boot/
-                       install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin
-                       ln -sf ${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
+                       install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
+                       ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
                fi
        done
 }
@@ -83,8 +83,8 @@ do_deploy(){
 
        for board in ${UBOOT_MACHINES}; do
                case "${board}" in
-               *SDCARD*)       UBOOT_TARGET="u-bootx-sd";;
-               *SPIFLASH*)     UBOOT_TARGET="u-bootx-spi";;
+               *SDCARD*)       UBOOT_TARGET="u-boot-sd";;
+               *SPIFLASH*)     UBOOT_TARGET="u-boot-spi";;
                *NAND*)         UBOOT_TARGET="u-boot-nand";;
                *)              UBOOT_TARGET="u-boot";;
                esac
@@ -94,15 +94,15 @@ do_deploy(){
                        install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin
 
                        cd ${DEPLOY_DIR_IMAGE}
-                       rm -f ${UBOOT_TARGET}-${MACHINE}.bin
-                       ln -sf ${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin ${UBOOT_TARGET}-${MACHINE}.bin
+                       rm -f ${UBOOT_TARGET}-${board}.bin
+                       ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
 
                        mkdir -p ${DEPLOYDIR}
-                       install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin
+                       install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
 
                        cd ${DEPLOYDIR}
-                       rm -f ${UBOOT_TARGET}-${MACHINE}.bin
-                        ln -sf ${UBOOT_TARGET}-${MACHINE}-${PV}-${PR}.bin ${UBOOT_TARGET}-${MACHINE}.bin
+                       rm -f ${UBOOT_TARGET}-${board}.bin
+                        ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
                fi
        done
 }