From 0194331f9ddfac53cd695a94709f405c8943ceb1 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 17 Apr 2013 16:54:04 -0500 Subject: [PATCH] uboot: ftd autodetection, simplify Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 2 +- hwpack/am335x-bone-video.conf | 2 +- hwpack/am335x-boneblack.conf | 2 +- mk_mmc.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index b53fc37..bcee490 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -19,7 +19,7 @@ boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_CMD_LOAD="load" -uboot_fdt_auto_detection="enabled" +uboot_fdt_auto_detection=1 #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 6ad752d..bc87388 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -19,7 +19,7 @@ boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_CMD_LOAD="load" -uboot_fdt_auto_detection="enabled" +uboot_fdt_auto_detection=1 #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 051481b..9e52ca2 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -19,7 +19,7 @@ boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_CMD_LOAD="load" -uboot_fdt_auto_detection="enabled" +uboot_fdt_auto_detection=1 #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp diff --git a/mk_mmc.sh b/mk_mmc.sh index d9b5328..fca067d 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -326,10 +326,10 @@ function dl_netinstall_image { function boot_uenv_txt_template { #Start with a blank state: - echo "" > ${TEMPDIR}/bootscripts/normal.cmd - echo "" > ${TEMPDIR}/bootscripts/netinstall.cmd + echo "#Normal Boot" > ${TEMPDIR}/bootscripts/normal.cmd + echo "#Debian Installer only Boot" > ${TEMPDIR}/bootscripts/netinstall.cmd - if [ "${need_dtbs}" ] && [ "x${uboot_fdt_auto_detection}" != "xenabled" ]; then + if [ "${need_dtbs}" ] && [ ! "${uboot_fdt_auto_detection}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ initrd_high=0xffffffff fdt_high=0xffffffff