From 56ae59dc5f34dc8fa07884a0d2cb0c3e795287cc Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 17 Jan 2018 19:20:36 +0100
Subject: u-boot-toradex: drop building a recovery u-boot

We move to use SPL/u-boot.img also in the recovery case.
Drop building the u-boot-recover.imx and no longer rename the
u-boot-spl.img file to the misleading name u-boot-spl.imx.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
 recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend | 53 ----------------------
 1 file changed, 53 deletions(-)

(limited to 'recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend')

diff --git a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
index 095e4c7..22e9d2f 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
+++ b/recipes-bsp/u-boot/u-boot-toradex_2016.11.bbappend
@@ -6,56 +6,3 @@ SRCREV = "30a1208727729dae22cb42f9ba9ba17efe5e6f77"
 SRCBRANCH = "2016.11-toradex"
 SRCREV_use-head-next = "${AUTOREV}"
 SRCBRANCH_use-head-next = "2016.11-toradex-next"
-
-# Hack around building two U-Boot configurations, one with, one without SPL
-# if using UBOOT_CONFIG to build more than one configuration, the current code in
-# u-boot.inc assumes all are either with or without SPL.
-compile_add() {
-    if [ -n "${UBOOT_CONFIG}" ]
-    then
-        for config in ${UBOOT_MACHINE}; do
-            touch ${B}/${config}/${SPL_BINARY}
-        done
-    fi
-}
-deploy_add() {
-    # if SPL is zero sized file, remove all deployed artefacts
-    if [ -n "${SPL_BINARY}" ]
-    then
-        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 [ ! -s ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} ]
-                        then
-                            rm -f ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR}
-                            rm -f ${DEPLOYDIR}/${SPL_BINARYNAME}-${type}
-                            rm -f ${DEPLOYDIR}/${SPL_SYMLINK}-${type}
-                            rm -f ${DEPLOYDIR}/${SPL_SYMLINK}
-                        else
-                            ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${SPL_BINARYNAME}
-                        fi
-                    fi
-                done
-                unset  j
-            done
-            unset  i
-        fi
-    fi
-}
-do_compile_append_mx6() {
-    compile_add
-}
-do_compile_append_use-mainline-bsp() {
-    compile_add
-}
-do_deploy_append_mx6() {
-    deploy_add
-}
-do_deploy_append_use-mainline-bsp() {
-    deploy_add
-}
-- 
cgit v1.2.3