diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 9b74cac..fffcf99 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index b7d64d4..ee5ae39 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 75b001c..ea4a717 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index d05bdb4..4d32696 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -23,10 +23,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
@@ -56,13 +56,12 @@ uboot_fdt_auto_detection=1
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_seek="1"
 dd_uboot_bs="1024"
-boot_partition_size="64"
-boot_startmb="2"
 unset spl_name
 boot_name="u-boot.imx"
 
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index d4bf6d0..bd29590 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index d772916..0b66ca3 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 5e7a400..c589902 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -10,9 +10,9 @@ conf_bootloader_in_flash="1"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 boot_fstype="ext2"
-boot_partition_size="96"
 boot_startmb="1"
 use_sfdisk=1
 
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index b0eacdc..b74c0e9 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -9,13 +9,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf
index 354960d..24a94e1 100644
--- a/hwpack/imx6q-wandboard.conf
+++ b/hwpack/imx6q-wandboard.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf
index cc9eb02..f42dd14 100644
--- a/hwpack/omap3-beagle-xm-v3.9-dt.conf
+++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 6e6e3ba..24fffbc 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf
index 1cd1de0..6f9095e 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf
index f6ba8c2..eaa4cb0 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/omap4-panda-v3.10-dt.conf b/hwpack/omap4-panda-v3.10-dt.conf
index 3274f80..41d3a7c 100644
--- a/hwpack/omap4-panda-v3.10-dt.conf
+++ b/hwpack/omap4-panda-v3.10-dt.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index 0589c07..4dae929 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -9,10 +9,10 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
 boot_fstype="fat"
-boot_partition_size="96"
 use_sfdisk=1
 spl_name="MLO"
 boot_name="u-boot.img"
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index e77d284..784d602 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
index 49ca50a..1ca6315 100644
--- a/hwpack/wandboard-quad.conf
+++ b/hwpack/wandboard-quad.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index 4be7899..9dfa5e2 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -11,13 +11,12 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_startmb="1"
+conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
 boot_fstype="ext2"
 dd_uboot_bs="512"
 dd_uboot_seek="2"
-boot_partition_size="96"
-boot_startmb="1"
 use_sfdisk=1
 unset spl_name
 boot_name="u-boot.imx"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index a4b9130..1b35806 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1143,7 +1143,7 @@ fdisk_boot_partition () {
 		p
 		1
 
-		+${boot_partition_size}M
+		+${conf_boot_endmb}M
 		t
 		e
 		p
@@ -1164,7 +1164,7 @@ sfdisk_boot_partition () {
 	echo "-----------------------------"
 
 	LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__
-		${conf_boot_startmb},${boot_partition_size},0xe,*
+		${conf_boot_startmb},${conf_boot_endmb},0xe,*
 	__EOF__
 
 	sync
@@ -1227,15 +1227,15 @@ create_partitions () {
 		dd_uboot_boot
 		if [ "${use_sfdisk}" ] ; then
 			LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__
-			${conf_boot_startmb},${boot_partition_size},0x83,*
+			${conf_boot_startmb},${conf_boot_endmb},0x83,*
 			__EOF__
 		else
-			LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${boot_partition_size}
+			LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${conf_boot_endmb}
 		fi
 		;;
 	dd_spl_uboot_boot)
 		dd_spl_uboot_boot
-		LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${boot_partition_size}
+		LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${conf_boot_endmb}
 		;;
 	*)
 		fdisk_boot_partition
@@ -1519,6 +1519,11 @@ process_dtb_conf () {
 		conf_boot_startmb="1"
 	fi
 
+	if [ ! "${conf_boot_endmb}" ] ; then
+		echo "Warning: [conf_boot_endmb] was undefined setting as: 96"
+		conf_boot_endmb="96"
+	fi
+
 	if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
 		conf_bootcmd="bootz"
 		conf_normal_kernel_file=zImage
@@ -1640,7 +1645,6 @@ check_uboot_type () {
 
 	unset boot_scr_wrapper
 	unset usbnet_mem
-	boot_partition_size="100"
 
 	case "${UBOOT_TYPE}" in
 	beagle_bx)
@@ -1663,6 +1667,7 @@ check_uboot_type () {
 	bone-serial|bone)
 		#Bootloader Partition:
 		conf_boot_startmb="1"
+		conf_boot_endmb="96"
 
 		need_am335x_firmware="1"
 		conf_entrypt="uenvcmd"
@@ -1690,6 +1695,7 @@ check_uboot_type () {
 	bone-video)
 		#Bootloader Partition:
 		conf_boot_startmb="1"
+		conf_boot_endmb="96"
 
 		need_am335x_firmware="1"
 		conf_entrypt="uenvcmd"