u-boot-ti.inc: Refactor overrides to match changes in oe-core

A recent change in oe-core [1] to refactor the uboot flow allows for a more
targeted refactoring of our override code as well.

Additionally, fix the UBOOT_CONFIG code to work correctly for k3r5
builds.

[1] https://git.openembedded.org/openembedded-core/commit/?id=e29d006a118643b276c6977cb70b0fb56635fc33

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

1 files changed, 192 insertions, 200 deletions

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index 4e6825a8..bb50e1e9 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -115,104 +115,115 @@ UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND"
 UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}"
 UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"
 
-do_compile:append:k3r5 () {
-        if [ -n "${UBOOT_CONFIG}" ];
-        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
-                                        if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then
-                                                ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY}
-                                        fi
-                                fi
-                        done
-                        unset  j
-                done
-                unset  i
-        else
-                if ! [ -f ${B}/${UBOOT_BINARY} ]; then
-                        ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
-                fi
-        fi
+uboot_compile:append () {
+    if ! [ -f ${B}/${UBOOT_BINARY} ]; then
+        ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
+    fi
 }
 
-do_install:append () {
-        if [ -n "${UBOOT_CONFIG}" ]
-        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
-                                        if [ "x${SPL_UART_BINARY}" != "x" ]; then
-                                                install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
-                                                install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}
-                                        fi
-                                fi
-                        done
-                        unset  j
-                done
-                unset  i
-        else
-                if [ "x${SPL_UART_BINARY}" != "x" ]; then
-                        install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
-                        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
-                fi
-                if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
-                        install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}
-                        ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
-                        ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
-                        ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}
-                        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
+uboot_compile_config_copy_binary:k3r5 () {
+    config=$1
+    type=$2
+    binary=$3
+
+    if ! [ -L ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
+        ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
+    fi
+
+    if ! [ -L ${B}/${config}/${binary} ] && ! [ -f ${B}/${config}/${binary} ]; then
+        ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${binary}
+    fi
+}
+
+uboot_install_config:append () {
+    if [ "x${SPL_UART_BINARY}" != "x" ]; then
+        install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
+    fi
+    if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}
+    fi
+}
+
+uboot_install:append () {
+    if [ "x${SPL_UART_BINARY}" != "x" ]; then
+        install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
+        ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
+    fi
+    if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}
+        ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
+        ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
+        ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}
+        ln -sf ${UBOOT_HS_2ND_IMAGE} ${D}/boot/${UBOOT_HS_2ND_BINARY}
+    fi
+}
+
+do_deploy:append:k3r5 () {
+        rm ${DEPLOYDIR}/u-boot-initial-env* || true
+        rm ${DEPLOYDIR}/${PN}-initial-env* || true
+        rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}* || true
+        rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}* || true
+        rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}* || true
+        rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}* || true
+}
+
+uboot_deploy_config:append:k3r5 () {
+    for f in ${B}/${config}/tiboot3-*.bin; do
+                if [ -f "$f" ]; then
+            f_base=$(basename $f)
+                        install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+            ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
                 fi
-                if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}
-                        ln -sf ${UBOOT_HS_2ND_IMAGE} ${D}/boot/${UBOOT_HS_2ND_BINARY}
+        done
+
+        for f in ${B}/${config}/sysfw*.itb; do
+                if [ -f "$f" ]; then
+            f_base=$(basename $f)
+                        install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
+            ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
                 fi
-        fi
+        done
 }
 
-do_deploy:append:k3r5 () {
-        for f in ${B}/tiboot3-*.bin; do
+uboot_deploy:append:k3r5 () {
+    for f in ${B}/tiboot3-*.bin; do
                 if [ -f "$f" ]; then
                         install -m 644 $f ${DEPLOYDIR}/
                 fi
@@ -223,117 +234,98 @@ do_deploy:append:k3r5 () {
                         install -m 644 $f ${DEPLOYDIR}/
                 fi
         done
+}
 
-        rm ${DEPLOYDIR}/u-boot-initial-env || true
-        rm ${DEPLOYDIR}/${PN}-initial-env || true
-        rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
-        rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
-        rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
-        rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
+uboot_deploy_config:append () {
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]; then
+        install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
+        rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
+        ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
+    fi
+    if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
+        rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
+        ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
+        rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
+        ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
+        rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
+        ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
+        rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
+    fi
+    if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
+        rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}-${type}
+        ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}
+    fi
 }
 
-do_deploy:append () {
-        if [ -n "${UBOOT_CONFIG}" ]
-        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
-                                        cd ${DEPLOYDIR}
-                                        if [ "x${SPL_UART_BINARY}" != "x" ]; then
-                                                install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
-                                                rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
-                                                ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
-                                        fi
-                                        if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
-                                                install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
-                                                rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
-                                                ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
-                                                rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
-                                                rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
-                                                rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
-                                        fi
-                                        if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-                                                install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
-                                                rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}-${type}
-                                                ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}
-                                        fi
-                                fi
-                        done
-                        unset  j
-                done
-                unset  i
-        else
-                cd ${DEPLOYDIR}
-                if [ "x${SPL_UART_BINARY}" != "x" ]; then
-                        install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
-                        rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
-                        ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
-                        ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
-                fi
-                if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
-                        install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}
-                        rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
-                        ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK}
-                        ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
-                        rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
-                        ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
-                        ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
-                        rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
-                        ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
-                        ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
-                        rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
-                        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
-                        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
-                fi
-                if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
-                        install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
-                        rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
-                        ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
-                        ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
-                fi
-        fi
+uboot_deploy:append () {
+    cd ${DEPLOYDIR}
+    if [ "x${SPL_UART_BINARY}" != "x" ]; then
+        install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
+        rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+        ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
+        ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
+    fi
+    if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
+        install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}
+        rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
+        ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK}
+        ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
+        install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
+        rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
+        ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
+        ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
+        install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
+        rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
+        ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
+        ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
+        install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
+        rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
+        ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
+    fi
+    if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
+        install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
+        rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
+        ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
+        ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
+    fi
 }
 
 do_install:append:am62xx() {