From 40d3d526cccb4bca015b456d94adad6ee7e34b9a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 21 Oct 2015 14:37:56 -0500
Subject: [PATCH] omap: work around ti mmcargs rewrite in u-boot

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/omap4-panda-a4.conf    |  1 +
 hwpack/omap4-panda-es-b3.conf |  1 +
 hwpack/omap4-panda-es.conf    |  1 +
 hwpack/omap4-panda.conf       |  1 +
 mk_mmc.sh                     | 14 ++++++++++++--
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf
index b859c8c..e052dfe 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -31,6 +31,7 @@ boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
 conf_smart_uboot="enable"
+conf_netinstall_enable="enable"
 
 #Kernel:
 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7
diff --git a/hwpack/omap4-panda-es-b3.conf b/hwpack/omap4-panda-es-b3.conf
index aa2308c..a1a49ec 100644
--- a/hwpack/omap4-panda-es-b3.conf
+++ b/hwpack/omap4-panda-es-b3.conf
@@ -31,6 +31,7 @@ boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
 conf_smart_uboot="enable"
+conf_netinstall_enable="enable"
 
 #Kernel:
 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7
diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf
index ee99b00..8b274b9 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -31,6 +31,7 @@ boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
 conf_smart_uboot="enable"
+conf_netinstall_enable="enable"
 
 #Kernel:
 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index d0dc79b..e429f8f 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -31,6 +31,7 @@ boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
 conf_smart_uboot="enable"
+conf_netinstall_enable="enable"
 
 #Kernel:
 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7
diff --git a/mk_mmc.sh b/mk_mmc.sh
index d8167b1..027e8f5 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1166,22 +1166,32 @@ populate_boot () {
 		if [ "x${di_serial_mode}" = "xenable" ] ; then
 			echo "message=echo; echo Installer for [${DISTARCH}] is using the Serial Interface; echo;" >> "${wfile}"
 			mmcargs="${mmcargs}=${SERIAL_CONSOLE} root=/dev/ram0 rw"
+			netinstall_bootargs="console=${SERIAL_CONSOLE}"
 		else
 			echo "message=echo; echo Installer for [${DISTARCH}] is using the Video Interface; echo Use [--serial-mode] to force Installing over the Serial Interface; echo;" >> "${wfile}"
 			mmcargs="${mmcargs}=tty0 root=/dev/ram0 rw"
+			netinstall_bootargs="console=tty0"
 		fi
 
 		if [ "x${drm_read_edid_broken}" = "xenable" ] ; then
 			mmcargs="${mmcargs} video=${drm_device_identifier}:1024x768@60e"
+			netinstall_bootargs="${netinstall_bootargs} video=${drm_device_identifier}:1024x768@60e"
 		fi
 
 		if [ ! "x${cmdline}" = "x" ] ; then
 			mmcargs="${mmcargs} ${cmdline}"
 		fi
 
-		echo "${mmcargs}" >> "${wfile}"
+		if [ "x${conf_netinstall_enable}" = "xenable" ] ; then
+			echo "netinstall_enable=enable" >> "${wfile}"
+			echo "netinstall_bootargs=${netinstall_bootargs}" >> "${wfile}"
+			echo "cmdline=${cmdline}" >> "${wfile}"
+		else
+			echo "${mmcargs}" >> "${wfile}"
+		fi
 
 		echo "Net Install Boot Script:"
+		echo "-----------------------------"
 		cat "${wfile}"
 		echo "-----------------------------"
 
@@ -1335,7 +1345,7 @@ process_dtb_conf () {
 			sfdisk_fstype="0xE"
 			;;
 		ext2|ext3|ext4)
-			sfdisk_fstype="0x83"
+			sfdisk_fstype="L"
 			;;
 		*)
 			echo "Error: [conf_boot_fstype] not recognized, stopping..."