From 63256e0b970cfa38bfb67763e6d573d1d4e94da5 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 7 Aug 2015 09:18:35 -0500
Subject: [PATCH] tegra124-jetson-tk1: use conf_config_distro_defaults

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/tegra124-jetson-tk1.conf | 27 +++------------------------
 mk_mmc.sh                       |  9 ---------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf
index 68e791d..da5831e 100644
--- a/hwpack/tegra124-jetson-tk1.conf
+++ b/hwpack/tegra124-jetson-tk1.conf
@@ -8,29 +8,8 @@ conf_bootloader_in_flash="enable"
 conf_boot_fstype="ext2"
 
 #Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-uboot_CONFIG_CMD_BOOTZ="enable"
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-uboot_CONFIG_SUPPORT_RAW_INITRD="enable"
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-uboot_CONFIG_CMD_FS_GENERIC="enable"
-
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
-conf_uboot_bootscript="boot.scr"
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x81000000"
-conf_loadaddr="0x80408000"
-conf_fdtaddr="0x82000000"
-conf_initrdaddr="0x82100000"
+conf_config_distro_defaults="enable"
+conf_smart_uboot="enable"
 
 #Kernel:
 #https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7-lpae
@@ -45,5 +24,5 @@ SERIAL="ttyS0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 drm_device_identifier="HDMI-A-1"
 di_serial_mode=enable
-conf_note="Required: https://github.com/NVIDIA/tegra-uboot-flasher-scripts"
+conf_note="Required: https://github.com/NVIDIA/tegra-uboot-flasher-scripts (tested: u-boot v2015.10-rc1)"
 #
diff --git a/mk_mmc.sh b/mk_mmc.sh
index fbc2d1a..803c4f0 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1116,15 +1116,6 @@ populate_boot () {
 				run uenvcmd
 			__EOF__
 			;;
-		tegra124-jetson-tk1.dtb)
-			cat > ${TEMPDIR}/bootscripts/loader.cmd <<-__EOF__
-				echo "${conf_uboot_bootscript} -> uEnv.txt wrapper..."
-				setenv bootpart \$devnum:1
-				${conf_fileload} mmc \${bootpart} \${loadaddr} uEnv.txt
-				env import -t \${loadaddr} \${filesize}
-				run uenvcmd
-			__EOF__
-			;;
 		esac
 		if [ -f ${TEMPDIR}/bootscripts/loader.cmd ] ; then
 			cat ${TEMPDIR}/bootscripts/loader.cmd