From 17bd5da2b75855b8a89c645732de6470b8db2c3a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 10 Jun 2014 13:36:10 -0500 Subject: [PATCH] mk_mmc.sh: if uboot_fdt_auto_detection works, drop initrd_high & fdt_high Signed-off-by: Robert Nelson --- mk_mmc.sh | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index 4aeacac..9682e59 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -294,25 +294,17 @@ boot_uenv_txt_template () { echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd echo "#Debian Installer only Boot" > ${TEMPDIR}/bootscripts/netinstall.cmd - cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ - initrd_high=0xffffffff - fdt_high=0xffffffff - - __EOF__ - - cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - initrd_high=0xffffffff - fdt_high=0xffffffff - - __EOF__ - if [ ! "${uboot_fdt_auto_detection}" ] ; 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 fdtfile=${conf_fdtfile} __EOF__