unify some of the common vars

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

mk_mmc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 #
 # Copyright (c) 2009-2012 Robert Nelson <robertcnelson@gmail.com>
 #
@@ -29,21 +29,27 @@
 MIRROR="http://rcn-ee.net/deb"
 BACKUP_MIRROR="http://rcn-ee.homeip.net:81/dl/mirrors/deb"
 
+BOOT_LABEL="boot"
+PARTITION_PREFIX=""
+
 unset MMC
+unset SPL_BOOT
+unset BOOTLOADER
+unset USE_BETA_BOOTLOADER
+unset DD_UBOOT
+unset ADDON
+
+#Common KMS:
+unset USE_KMS
+unset KMS_OVERRIDE
+
 unset FIRMWARE
 unset SERIAL_MODE
-unset USE_BETA_BOOTLOADER
 unset BETA_KERNEL
 unset EXPERIMENTAL_KERNEL
 unset PRINTK
-unset SPL_BOOT
-unset BOOTLOADER
 unset SMSC95XX_MOREMEM
-unset DD_UBOOT
 unset KERNEL_DEB
-unset USE_KMS
-unset KMS_OVERRIDE
-unset ADDON
 
 GIT_VERSION=$(git rev-parse --short HEAD)
 IN_VALID_UBOOT=1
@@ -56,9 +62,6 @@ DIST=squeeze
 ARCH=armel
 DISTARCH="${DIST}-${ARCH}"
 
-BOOT_LABEL=boot
-PARTITION_PREFIX=""
-
 #06-Oct-2010
 #http://ports.ubuntu.com/dists/maverick/main/installer-armel/
 MAVERICK_NETIMAGE="current"