From 3e47097bb954f1a88fa05cc6a10653b30fd6064a Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 7 Aug 2015 11:02:28 -0500
Subject: [PATCH] nvidia: add more firmware rtl_nic

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 lib/debian-finish.sh | 7 +++++--
 lib/ubuntu-finish.sh | 7 +++++--
 mk_mmc.sh            | 6 ++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index fce1a34..56c71d6 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -49,7 +49,7 @@ if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
 fi
 
 if [ -f /etc/inittab ] ; then
-if [ "x${serial_tty}" != "x" ] ; then
+	if [ ! "x${serial_tty}" = "x" ] ; then
 		cp /etc/inittab /boot/uboot/backup/inittab
 		serial_num=$(echo -n "${serial_tty}"| tail -c -1)
 
@@ -114,7 +114,10 @@ else
 	fi
 fi
 
-echo "set_boot_args=setenv bootargs console=\${console} \${optargs} \${cape_disable} \${cape_enable} root=\${root} rootfstype=\${rootfstype} \${cmdline}"  >> ${wfile}
+if [ ! "x${serial_tty}" = "x" ] ; then
+	echo "backup_serial_console=${serial_tty},115200n8" >> ${wfile}
+fi
+echo "set_boot_args=setenv bootargs console=\${console} \${optargs} \${cape_disable} \${cape_enable} root=\${root} rootfstype=\${rootfstype} \${cmdline}" >> ${wfile}
 echo "uuid=$(/sbin/blkid -c /dev/null -s UUID -o value ${FINAL_PART})" >> ${wfile}
 echo "root=${FINAL_PART} ro" >> ${wfile}
 echo "rootfstype=${FINAL_FSTYPE} fixrtc" >> ${wfile}
diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh
index ea55503..8e39574 100644
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@@ -48,7 +48,7 @@ if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
 	fi
 fi
 
-if [ "x${serial_tty}" != "x" ] ; then
+if [ ! "x${serial_tty}" = "x" ] ; then
 	cat > /etc/init/${serial_tty}.conf <<-__EOF__
 		start on stopped rc RUNLEVEL=[2345]
 		stop on runlevel [!2345]
@@ -104,7 +104,10 @@ else
 	fi
 fi
 
-echo "set_boot_args=setenv bootargs console=\${console} \${optargs} \${cape_disable} \${cape_enable} root=\${root} rootfstype=\${rootfstype} \${cmdline}"  >> ${wfile}
+if [ ! "x${serial_tty}" = "x" ] ; then
+	echo "backup_serial_console=${serial_tty},115200n8" >> ${wfile}
+fi
+echo "set_boot_args=setenv bootargs console=\${console} \${optargs} \${cape_disable} \${cape_enable} root=\${root} rootfstype=\${rootfstype} \${cmdline}" >> ${wfile}
 echo "uuid=$(/sbin/blkid -c /dev/null -s UUID -o value ${FINAL_PART})" >> ${wfile}
 echo "root=${FINAL_PART} ro" >> ${wfile}
 echo "rootfstype=${FINAL_FSTYPE} fixrtc" >> ${wfile}
diff --git a/mk_mmc.sh b/mk_mmc.sh
index d927fc8..72dd877 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -517,6 +517,8 @@ dl_device_firmware () {
 		echo "-----------------------------"
 		echo "Adding NVIDIA firmware:"
 		cp -rv "${DIR}/dl/linux-firmware/nvidia" ${TEMPDIR}/firmware/
+		mkdir -p ${TEMPDIR}/firmware/rtl_nic/
+		cp -v "${DIR}/dl/linux-firmware/rtl_nic/rtl8168g-2.fw" ${TEMPDIR}/firmware/rtl_nic
 		echo "-----------------------------"
 		;;
 	esac
@@ -1154,10 +1156,6 @@ 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