From 674e59bf0b2267729b70d7fb35612a33405648bf Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 28 Jul 2014 14:22:50 -0500
Subject: [PATCH] mk_mmc.sh: bootloader is external

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx6q-sabrelite.conf     |  3 +--
 hwpack/tegra124-jetson-tk1.conf |  4 +---
 mk_mmc.sh                       | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 649d17e..385478c 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -2,8 +2,7 @@
 #        --dtb imx6q-sabrelite (Boundary Devices: Freescale i.MX6Q Board:supported)
 
 #Bootloader:
-conf_board="MX6QSABRELITE_D"
-conf_bootloader_in_flash="1"
+conf_bootloader_in_flash="enable"
 
 #Bootloader Partition:
 conf_boot_fstype="ext2"
diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf
index 3d9c6bd..702e52a 100644
--- a/hwpack/tegra124-jetson-tk1.conf
+++ b/hwpack/tegra124-jetson-tk1.conf
@@ -1,10 +1,8 @@
 #!/bin/bash
 #        --dtb tegra124-jetson-tk1 (NVIDIA Jetson TK1:supported)
 
-conf_board="tegra124-jetson-tk1"
-
 #Bootloader:
-conf_bootloader_in_flash="1"
+conf_bootloader_in_flash="enable"
 
 #Bootloader Partition:
 conf_boot_fstype="ext2"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 080dfd2..6d55aa6 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -803,13 +803,15 @@ extract_zimage () {
 generate_soc () {
 	echo "#!/bin/sh" > ${wfile}
 	echo "format=1.0" >> ${wfile}
-	echo "board=${conf_board}" >> ${wfile}
-	echo "" >> ${wfile}
-	echo "bootloader_location=${bootloader_location}" >> ${wfile}
-	echo "dd_spl_uboot_seek=${dd_spl_uboot_seek}" >> ${wfile}
-	echo "dd_spl_uboot_bs=${dd_spl_uboot_bs}" >> ${wfile}
-	echo "dd_uboot_seek=${dd_uboot_seek}" >> ${wfile}
-	echo "dd_uboot_bs=${dd_uboot_bs}" >> ${wfile}
+	if [ ! "x{conf_bootloader_in_flash}" = "xenable" ] ; then
+		echo "board=${conf_board}" >> ${wfile}
+		echo "" >> ${wfile}
+		echo "bootloader_location=${bootloader_location}" >> ${wfile}
+		echo "dd_spl_uboot_seek=${dd_spl_uboot_seek}" >> ${wfile}
+		echo "dd_spl_uboot_bs=${dd_spl_uboot_bs}" >> ${wfile}
+		echo "dd_uboot_seek=${dd_uboot_seek}" >> ${wfile}
+		echo "dd_uboot_bs=${dd_uboot_bs}" >> ${wfile}
+	fi
 	echo "" >> ${wfile}
 	echo "boot_fstype=${conf_boot_fstype}" >> ${wfile}
 	echo "" >> ${wfile}
@@ -1562,7 +1564,7 @@ echo "-----------------------------"
 check_root
 detect_software
 
-if [ ! "${conf_bootloader_in_flash}" ] ; then
+if [ ! "x{conf_bootloader_in_flash}" = "xenable" ] ; then
 	if [ "${spl_name}" ] || [ "${boot_name}" ] ; then
 		if [ "${USE_LOCAL_BOOT}" ] ; then
 			local_bootloader