From 5321989ce9997b8200a7df3cccdfd5a7a94b52a7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 7 Aug 2015 10:37:57 -0500
Subject: [PATCH] add backup_serial_console option

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 lib/distro_defaults.cmd |   6 ++++++
 lib/distro_defaults.scr | Bin 4497 -> 4632 bytes
 mk_mmc.sh               |   4 ++++
 3 files changed, 10 insertions(+)

diff --git a/lib/distro_defaults.cmd b/lib/distro_defaults.cmd
index c952c98..b65b86d 100644
--- a/lib/distro_defaults.cmd
+++ b/lib/distro_defaults.cmd
@@ -38,6 +38,12 @@ for i in 1 2 3 4 5 6 7 ; do
 			echo Using: [rootfstype=ext4] ...;
 		fi;
 
+		if test -n ${console}; then
+			if test -n ${backup_serial_console}; then
+				setenv console ${backup_serial_console}
+			fi ;
+		fi ;
+
 		if test -n ${uname_r}; then
 			setenv bootdir /boot;
 			setenv bootfile vmlinuz-${uname_r};
diff --git a/lib/distro_defaults.scr b/lib/distro_defaults.scr
index 0adeb232addbacf00c89114bded4f39505fd374c..9a046dc69f3c779a84854420858d6343d262fa31 100644
GIT binary patch
delta 183
zcmbQJJVQlBomDdIdc2Qp=#dLY85jg_FhD`>f%6L{0%b3N_>=qCq&FtdWvNfj&nwQ)
zNv*Y3D9K38<KpDx%uG`#Ni8l>(9Kg&sZL5v&Mqy8FHSAWOw5VLRLohNT9TSqrT~?}
YsRLwiTBd?EkOosg8f?$zA1pI@0Q#glp8x;=

delta 55
zcmbQCGErGZomDbS(Dmizkd8Tu3=D#S3{b$$bJTMpP}UQ~pL~;5dSmijmd)*~6L|o0
Cb`6;T

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 59ff89c..d927fc8 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1154,6 +1154,10 @@ populate_boot () {
 			echo "#dtb=" >>  ${wfile}
 		fi
 
+		if [ ! "x${SERIAL_CONSOLE}" = "x" ] ; then
+			echo "backup_serial_console=${SERIAL_CONSOLE}" >> ${wfile}
+		fi
+
 		mmcargs="mmcargs=run message; setenv bootargs console"
 
 		if [ "x${di_serial_mode}" = "xenable" ] ; then