From 0d7cc022cc110db539149d4248c26741044e3729 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 21 Jun 2013 10:43:53 -0500
Subject: [PATCH] imx6q-sabrelite: bootloader no longer required

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx6q-sabrelite.conf | 11 +----------
 mk_mmc.sh                   | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 3ae177d..70306b4 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -6,18 +6,9 @@ SYSTEM="mx6qsabrelite"
 
 #Bootloader:
 conf_board="MX6QSABRELITE_D"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-bootloader_location="dd_uboot_boot"
+conf_bootloader_in_flash="1"
 boot_fstype="ext2"
-dd_uboot_bs="512"
-dd_uboot_seek="2"
 boot_partition_size="100"
-boot_startmb="2"
-unset spl_name
-boot_name="u-boot.imx"
 
 #Bootloader: u-boot features:
 
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 9d1b997..871c143 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1051,10 +1051,10 @@ fatfs_boot_error () {
 	exit
 }
 
-fatfs_boot () {
-	#For: TI: Omap/Sitara Devices
+fdisk_boot_partition () {
+	#Generic boot partition created by fdisk
 	echo ""
-	echo "Using fdisk to create an omap compatible fatfs BOOT partition"
+	echo "Using fdisk to create BOOT partition"
 	echo "-----------------------------"
 
 	fdisk ${MMC} <<-__EOF__
@@ -1076,10 +1076,10 @@ fatfs_boot () {
 	LC_ALL=C parted --script ${MMC} set 1 boot on || fatfs_boot_error
 }
 
-sfdisk_fatfs_boot () {
-	#For: TI: Omap/Sitara Devices
+sfdisk_boot_partition () {
+	#Generic boot partition created by sfdisk
 	echo ""
-	echo "Using sfdisk to create an omap compatible fatfs BOOT partition"
+	echo "Using sfdisk to create BOOT partition"
 	echo "-----------------------------"
 
 	LC_ALL=C sfdisk --DOS --sectors 63 --heads 255 --unit M "${MMC}" <<-__EOF__
@@ -1137,9 +1137,9 @@ create_partitions () {
 	case "${bootloader_location}" in
 	fatfs_boot)
 		if [ "${use_sfdisk}" ] ; then
-			sfdisk_fatfs_boot
+			sfdisk_boot_partition
 		else
-			fatfs_boot
+			fdisk_boot_partition
 		fi
 		;;
 	dd_uboot_boot)
@@ -1151,7 +1151,7 @@ create_partitions () {
 		LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${boot_startmb} ${boot_partition_size}
 		;;
 	*)
-		LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${boot_startmb} ${boot_partition_size}
+		fdisk_boot_partition
 		;;
 	esac
 	format_boot_partition
@@ -1892,11 +1892,13 @@ echo "-----------------------------"
 check_root
 detect_software
 
-if [ "${spl_name}" ] || [ "${boot_name}" ] ; then
-	if [ "${USE_LOCAL_BOOT}" ] ; then
-		local_bootloader
-	else
-		dl_bootloader
+if [ ! "${conf_bootloader_in_flash}" ] ; then
+	if [ "${spl_name}" ] || [ "${boot_name}" ] ; then
+		if [ "${USE_LOCAL_BOOT}" ] ; then
+			local_bootloader
+		else
+			dl_bootloader
+		fi
 	fi
 fi