From 6d58b670f7aa09c88e123c17946c662cefd7b3e6 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 21 Nov 2011 11:43:35 -0600
Subject: [PATCH] cleanup: call dl_bootloader early

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 61 +++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 83c8234..9510e2c 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -140,6 +140,35 @@ fi
 
 }
 
+function dl_bootloader {
+ echo ""
+ echo "Downloading Device's Bootloader"
+ echo "-----------------------------"
+
+ mkdir -p ${TEMPDIR}/dl/${DIST}
+ mkdir -p ${DIR}/dl/${DIST}
+
+ wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}tools/latest/bootloader
+
+ if [ "$USE_BETA_BOOTLOADER" ];then
+  ABI="ABX"
+ else
+  ABI="ABI"
+ fi
+
+ if [ "${SPL_BOOT}" ] ; then
+  MLO=$(cat ${TEMPDIR}/dl/bootloader | grep "${ABI}:${ABI_VER}:MLO" | awk '{print $2}')
+  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MLO}
+  MLO=${MLO##*/}
+  echo "SPL Bootloader: ${MLO}"
+ fi
+
+ UBOOT=$(cat ${TEMPDIR}/dl/bootloader | grep "${ABI}:${ABI_VER}:UBOOT" | awk '{print $2}')
+ wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${UBOOT}
+ UBOOT=${UBOOT##*/}
+ echo "UBOOT Bootloader: ${UBOOT}"
+}
+
 function boot_files_template {
 
 mkdir -p ${TEMPDIR}/bootscripts/
@@ -275,35 +304,6 @@ fi
  fi
 }
 
-function dl_bootloader {
- echo ""
- echo "Downloading Device's Bootloader"
- echo "-----------------------------"
-
- mkdir -p ${TEMPDIR}/dl/${DIST}
- mkdir -p ${DIR}/dl/${DIST}
-
- wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}tools/latest/bootloader
-
- if [ "$USE_BETA_BOOTLOADER" ];then
-  ABI="ABX"
- else
-  ABI="ABI"
- fi
-
- if [ "${SPL_BOOT}" ] ; then
-  MLO=$(cat ${TEMPDIR}/dl/bootloader | grep "${ABI}:${ABI_VER}:MLO" | awk '{print $2}')
-  wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MLO}
-  MLO=${MLO##*/}
-  echo "SPL Bootloader: ${MLO}"
- fi
-
- UBOOT=$(cat ${TEMPDIR}/dl/bootloader | grep "${ABI}:${ABI_VER}:UBOOT" | awk '{print $2}')
- wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${UBOOT}
- UBOOT=${UBOOT##*/}
- echo "UBOOT Bootloader: ${UBOOT}"
-}
-
 function set_defaults {
 
  if [ "$USE_UENV" ];then
@@ -359,8 +359,6 @@ fi
 
 function dl_xload_uboot {
 
-dl_bootloader
-
 case "$DIST" in
     maverick)
 	TEST_MD5SUM=$MAVERICK_MD5SUM
@@ -1360,6 +1358,7 @@ fi
 
  find_issue
  detect_software
+ dl_bootloader
 
  boot_files_template
  set_defaults