From 7e70bba8ecae019b437de5ee25693dbcf25220ac Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 28 Jul 2014 14:14:56 -0500
Subject: [PATCH] cleanup: conf_fdtfile -> dtb

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

diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index ec4b49e..5cc3a39 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -47,7 +47,7 @@ conf_loadaddr="0x12000000"
 conf_fdtaddr="0x11000000"
 #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
 conf_initrdaddr="0x12A00000"
-conf_fdtfile="imx6q-sabrelite.dtb"
+dtb="imx6q-sabrelite.dtb"
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf
index 921c9bd..3d9c6bd 100644
--- a/hwpack/tegra124-jetson-tk1.conf
+++ b/hwpack/tegra124-jetson-tk1.conf
@@ -45,7 +45,7 @@ conf_zreladdr="0x81000000"
 conf_loadaddr="0x80408000"
 conf_fdtaddr="0x82000000"
 conf_initrdaddr="0x82100000"
-conf_fdtfile="tegra124-jetson-tk1.dtb"
+dtb="tegra124-jetson-tk1.dtb"
 
 SERIAL="ttyS0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index d98ec4d..080dfd2 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -274,12 +274,12 @@ boot_uenv_txt_template () {
 
 	if [ ! "${uboot_fdt_auto_detection}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			fdtfile=${conf_fdtfile}
+			fdtfile=${dtb}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			fdtfile=${conf_fdtfile}
+			fdtfile=${dtb}
 
 		__EOF__
 	fi
@@ -1067,7 +1067,7 @@ populate_boot () {
 	fi
 
 	if [ "${conf_uboot_bootscript}" ] ; then
-		case "${conf_fdtfile}" in
+		case "${dtb}" in
 		imx6q-sabrelite.dtb)
 			cat > ${TEMPDIR}/bootscripts/loader.cmd <<-__EOF__
 				echo "${conf_uboot_bootscript} -> uEnv.txt wrapper..."
@@ -1098,7 +1098,7 @@ populate_boot () {
 			mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/${conf_uboot_bootscript}
 			cp -v ${TEMPDIR}/disk/${conf_uboot_bootscript} ${TEMPDIR}/disk/backup/${conf_uboot_bootscript}
 		else
-			echo "Error: conf_fdtfile not defined with conf_uboot_bootscript"
+			echo "Error: dtb not defined with conf_uboot_bootscript"
 			exit 1
 		fi
 	fi