From a057f900f43d8f6a6ae631bd435949846a072b67 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Fri, 11 Dec 2015 01:26:16 -0600 Subject: [PATCH] u-boot-ls1: The finale u-boot binary is not named as u-boot.bin for sdcard/spi Signed-off-by: Chunrong Guo Signed-off-by: Otavio Salvador --- recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb | 31 +++++++++++++++------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb index 44480b9e..cc3d611a 100644 --- a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb +++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb @@ -100,18 +100,29 @@ do_compile_append_qoriq-ppc() { } do_compile_append_qoriq-arm () { - if [ "x${UBOOT_CONFIG}" != "x" ] - then - for config in ${UBOOT_MACHINE}; do - case "${config}" in - *spi*) tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${S}/${config}/u-boot-dtb.bin ${S}/${config}/u-boot.swap.bin 8 - mv ${S}/${config}/u-boot.swap.bin ${S}/u-boot-${type}.${UBOOT_SUFFIX};; - *nand* | *sdcard*) mv ${S}/${config}/u-boot-with-spl-pbl.bin ${S}/${config}/u-boot.bin;; - esac - done - fi +unset i j + if [ "x${UBOOT_CONFIG}" != "x" ]; then + for config in ${UBOOT_MACHINE}; do + i=`expr $i + 1`; + for type in ${UBOOT_CONFIG}; do + j=`expr $j + 1`; + if [ $j -eq $i ]; then + case "${config}" in + *nand* | *sdcard*) + cp ${config}/u-boot-with-spl-pbl.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};; + *spi*) + tclsh ${STAGING_BINDIR_NATIVE}/byte_swap.tcl ${config}/u-boot-dtb.bin ${config}/u-boot.swap.bin 8 + cp ${config}/u-boot.swap.bin ${config}/u-boot-${type}.${UBOOT_SUFFIX};; + esac + fi + done + unset j + done + unset i + fi } + do_install_append_qoriq-ppc() { for board in ${UBOOT_MACHINE}; do if ! grep -wq $board ${S}/boards.cfg;then -- 2.40.1