From b758659a117664c4f66067595adfb1b4c5f7f004 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 3 Oct 2013 13:34:13 -0500
Subject: [PATCH] dt: make sure initrd_high & fdt_high are set, fixes dt-panda

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 8dff912..df9e1f4 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -320,17 +320,27 @@ boot_uenv_txt_template () {
 	echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd
 	echo "#Debian Installer only Boot" > ${TEMPDIR}/bootscripts/netinstall.cmd
 
-	if [ "${need_dtbs}" ] && [ ! "${uboot_fdt_auto_detection}" ] ; then
+	if [ "${need_dtbs}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff
-			fdtfile=${conf_fdtfile}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff
+
+		__EOF__
+	fi
+
+	if [ "${need_dtbs}" ] && [ ! "${uboot_fdt_auto_detection}" ] ; then
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			fdtfile=${conf_fdtfile}
+
+		__EOF__
+
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 			fdtfile=${conf_fdtfile}
 
 		__EOF__