cleanup: before bootloader rewrite

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

mk_mmc.sh

@@ -197,12 +197,12 @@ function dl_bootloader {
 		wget --no-verbose --directory-prefix=${TEMPDIR}/dl/ ${MIRROR}/tools/latest/bootloader
 	fi
 
-	if [ "$RCNEEDOWN" ];then
+	if [ "${RCNEEDOWN}" ] ; then
 		sed -i -e "s/rcn-ee.net/rcn-ee.homeip.net:81/g" ${TEMPDIR}/dl/bootloader
 		sed -i -e 's:81/deb/:81/dl/mirrors/deb/:g' ${TEMPDIR}/dl/bootloader
 	fi
 
- if [ "$USE_BETA_BOOTLOADER" ];then
+	if [ "${USE_BETA_BOOTLOADER}" ] ; then
 		ABI="ABX2"
 	else
 		ABI="ABI2"
@@ -948,11 +948,8 @@ function initrd_fixes {
 	fi
 
 	if [ "${SERIAL_MODE}" ] ; then
-  if [ ! "${DD_UBOOT}" ] ; then
-   #this needs more thought, need to disable the check for mx53loco, but maybe we don't need it for omap..
 		touch ${TEMPDIR}/initrd-tree/etc/rcn-serial.conf
 	fi
- fi
 }
 
 function recompress_initrd {
@@ -1017,9 +1014,9 @@ function unmount_all_drive_partitions {
 	LC_ALL=C parted --script ${MMC} mklabel msdos | grep "Error:" && drive_error_ro
 }
 
-function uboot_in_boot_partition {
+function omap_fatfs_boot_part {
 	echo ""
-	echo "Using fdisk to create BOOT Partition"
+	echo "Using fdisk to create an omap compatible fatfs BOOT partition"
 	echo "-----------------------------"
 
 	fdisk ${MMC} <<-__EOF__
@@ -1048,9 +1045,9 @@ function uboot_in_boot_partition {
 	fi
 }
 
-function dd_uboot_before_boot_partition {
+function dd_to_drive {
 	echo ""
- echo "Using dd to place bootloader before BOOT Partition"
+	echo "Using dd to place bootloader on drive"
 	echo "-----------------------------"
 	dd if=${TEMPDIR}/dl/${UBOOT} of=${MMC} seek=1 bs=1024
 
@@ -1068,13 +1065,11 @@ function format_boot_partition {
 }
 
 function create_partitions {
-
-if [ "${DD_UBOOT}" ] ; then
- dd_uboot_before_boot_partition
-else
- uboot_in_boot_partition
-fi
-
+	if [ "${DD_UBOOT}" ] ; then
+		dd_to_drive
+	else
+		omap_fatfs_boot_part
+	fi
 	format_boot_partition
 }
 
@@ -1087,8 +1082,8 @@ function populate_boot {
 	fi
 
 	if mount -t vfat ${MMC}${PARTITION_PREFIX}1 ${TEMPDIR}/disk; then
-
 		mkdir -p ${TEMPDIR}/disk/backup
+
 		if [ "${SPL_BOOT}" ] ; then
 			if [ -f ${TEMPDIR}/dl/${MLO} ]; then
 				cp -v ${TEMPDIR}/dl/${MLO} ${TEMPDIR}/disk/MLO
@@ -1156,7 +1151,6 @@ cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DEB_FILE}" ${TEMPDIR}/disk/
 
 		cat > ${TEMPDIR}/disk/SOC.sh <<-__EOF__
 			#!/bin/sh
-			#[socpack]
 			format=1.0
 			board=${BOOTLOADER}
 			kernel_addr=${kernel_addr}