From 68144ad5bdfd0695b0e8acd00b7d70db89f6ff1b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 28 Jul 2014 12:57:33 -0500
Subject: [PATCH] mk_mmc.sh: cleanup: drop SYSTEM

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx6q-sabrelite.conf |  2 --
 mk_mmc.sh                   | 17 ++++-------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 45b106b..ec4b49e 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -49,8 +49,6 @@ conf_fdtaddr="0x11000000"
 conf_initrdaddr="0x12A00000"
 conf_fdtfile="imx6q-sabrelite.dtb"
 
-SYSTEM="video"
-
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 0987e13..d98ec4d 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -405,30 +405,21 @@ boot_uenv_txt_template () {
 		__EOF__
 	fi
 
-	case "${SYSTEM}" in
-	video)
+	if [ ! "x${di_serial_mode}" = "xenable" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 		__EOF__
-		;;
-	esac
+	fi
 
 	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 		mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype}
-	__EOF__
-
-	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-		optargs=${conf_optargs}
-		mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot}
-	__EOF__
-
-
-	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 		${conf_entrypt}=run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 	__EOF__
 
 	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+		optargs=${conf_optargs}
+		mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot}
 		${conf_entrypt}=run xyz_message; run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 	__EOF__