From 8c3e2eddfbe8fdbd4bc2a270daa73d1f76a40fea Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 12 Jul 2013 11:20:23 -0500
Subject: [PATCH] boot partition: no reason to limit vfat/ext2, ext3/ext4 could
 also be used

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/docs.txt      | 10 ++++++++--
 lib/debian-finish.sh |  6 +++---
 lib/ubuntu-finish.sh |  6 +++---
 mk_mmc.sh            |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index 4d32696..0ff54a9 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -22,11 +22,14 @@ conf_bl_listfile="bootloader-ng"
 [omap and a mainline u-boot]
 
 #Bootloader Partition:
+conf_boot_fstype="fat"
+#conf_boot_fstype="ext2"
+#conf_boot_fstype="ext3"
+#conf_boot_fstype="ext4"
 conf_boot_startmb="1"
 conf_boot_endmb="96"
 
 bootloader_location="fatfs_boot"
-boot_fstype="fat"
 spl_name="MLO"
 boot_name="u-boot.img"
 
@@ -55,11 +58,14 @@ uboot_fdt_auto_detection=1
 [imx and a mainline u-boot]
 
 #Bootloader Partition:
+#conf_boot_fstype="fat"
+conf_boot_fstype="ext2"
+#conf_boot_fstype="ext3"
+#conf_boot_fstype="ext4"
 conf_boot_startmb="1"
 conf_boot_endmb="96"
 
 bootloader_location="dd_uboot_boot"
-boot_fstype="ext2"
 dd_uboot_seek="1"
 dd_uboot_bs="1024"
 unset spl_name
diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index a289cad..357d176 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -83,10 +83,10 @@ else
 	echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log
 fi
 
-if [ "x${boot_fstype}" = "xext2" ] ; then
-	echo "${bootdrive}p1    /boot/uboot    ext2    defaults    0    2" >> /etc/fstab
-else
+if [ "x${boot_fstype}" = "xfat" ] ; then
 	echo "${bootdrive}p1    /boot/uboot    auto    defaults    0    0" >> /etc/fstab
+else
+	echo "${bootdrive}p1    /boot/uboot    ${boot_fstype}    defaults    0    2" >> /etc/fstab
 fi
 
 if [ "x${usbnet_mem}" != "x" ] ; then
diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh
index df11026..647b99c 100644
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@@ -142,10 +142,10 @@ else
 	echo "WARN: [serial_tty] was undefined..." >> /var/log/netinstall.log
 fi
 
-if [ "x${boot_fstype}" = "xext2" ] ; then
-	echo "${bootdrive}p1    /boot/uboot    ext2    defaults    0    2" >> /etc/fstab
-else
+if [ "x${boot_fstype}" = "xfat" ] ; then
 	echo "${bootdrive}p1    /boot/uboot    auto    defaults    0    0" >> /etc/fstab
+else
+	echo "${bootdrive}p1    /boot/uboot    ${boot_fstype}    defaults    0    2" >> /etc/fstab
 fi
 
 if [ "x${usbnet_mem}" != "x" ] ; then
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 62f887b..12e700d 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1167,8 +1167,8 @@ create_partitions () {
 		mkfs="mkfs.vfat -F 16"
 		mkfs_label="-n ${BOOT_LABEL}"
 	else
-		mount_partition_format="ext2"
-		mkfs="mkfs.ext2"
+		mount_partition_format="${conf_boot_fstype}"
+		mkfs="mkfs.${conf_boot_fstype}"
 		mkfs_label="-L ${BOOT_LABEL}"
 	fi