From bdf66719af42ee368b0fedb690f4bf9a1e778774 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 29 Jul 2014 09:21:46 -0500
Subject: [PATCH] cleanup: drop conf_ prefix

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

diff --git a/hwpack/imx6q-nitrogen6x.conf b/hwpack/imx6q-nitrogen6x.conf
index f034c90..f89ef03 100644
--- a/hwpack/imx6q-nitrogen6x.conf
+++ b/hwpack/imx6q-nitrogen6x.conf
@@ -11,15 +11,15 @@ conf_boot_fstype="ext2"
 
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
+uboot_CONFIG_CMD_BOOTZ=1
 
 #CONFIG_SUPPORT_RAW_INITRD
 #allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
+uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #CONFIG_CMD_FS_GENERIC
 #allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
+uboot_CONFIG_CMD_FS_GENERIC=1
 
 #can the bootloader auto detect the device: (*.dtb)?
 #uboot_fdt_auto_detection=1
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 5105ea2..dc610e0 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -11,15 +11,15 @@ conf_boot_fstype="fat"
 
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
+uboot_CONFIG_CMD_BOOTZ=1
 
 #CONFIG_SUPPORT_RAW_INITRD
 #allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
+uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #CONFIG_CMD_FS_GENERIC
 #allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
+uboot_CONFIG_CMD_FS_GENERIC=1
 
 #can the bootloader auto detect the device: (*.dtb)?
 #uboot_fdt_auto_detection=1
diff --git a/hwpack/tegra124-jetson-tk1.conf b/hwpack/tegra124-jetson-tk1.conf
index 4d41f3c..94e355b 100644
--- a/hwpack/tegra124-jetson-tk1.conf
+++ b/hwpack/tegra124-jetson-tk1.conf
@@ -11,15 +11,15 @@ conf_boot_fstype="ext2"
 
 #CONFIG_CMD_BOOTZ
 #bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
+uboot_CONFIG_CMD_BOOTZ=1
 
 #CONFIG_SUPPORT_RAW_INITRD
 #allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
+uboot_CONFIG_SUPPORT_RAW_INITRD=1
 
 #CONFIG_CMD_FS_GENERIC
 #allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
+uboot_CONFIG_CMD_FS_GENERIC=1
 
 #can the bootloader auto detect the device: (*.dtb)?
 #uboot_fdt_auto_detection=1
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 5927f99..4dddc95 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -985,7 +985,7 @@ populate_boot () {
 
 		if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
 			touch ${TEMPDIR}/disk/boot/trampoline.uboot
-			if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
+			if [ "${uboot_CONFIG_CMD_BOOTZ}" ] ; then
 				cp -v ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/zImage.net
 			else
 				mkimage -A arm -O linux -T kernel -C none -a ${conf_zreladdr} -e ${conf_zreladdr} -n ${LINUX_VER} -d ${TEMPDIR}/kernel/boot/vmlinuz-* ${TEMPDIR}/disk/uImage.net
@@ -1245,7 +1245,7 @@ process_dtb_conf () {
 		esac
 	fi
 
-	if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
+	if [ "${uboot_CONFIG_CMD_BOOTZ}" ] ; then
 		conf_bootcmd="bootz"
 		conf_normal_kernel_file=zImage
 		conf_net_kernel_file=zImage.net
@@ -1257,7 +1257,7 @@ process_dtb_conf () {
 		kernel=/boot/uImage
 	fi
 
-	if [ "${conf_uboot_CONFIG_SUPPORT_RAW_INITRD}" ] ; then
+	if [ "${uboot_CONFIG_SUPPORT_RAW_INITRD}" ] ; then
 		conf_normal_initrd_file=initrd.img
 		conf_net_initrd_file=initrd.net
 		initrd=/boot/initrd.img-current
@@ -1268,7 +1268,7 @@ process_dtb_conf () {
 		initrd=/boot/uInitrd
 	fi
 
-	if [ "${conf_uboot_CONFIG_CMD_FS_GENERIC}" ] ; then
+	if [ "${uboot_CONFIG_CMD_FS_GENERIC}" ] ; then
 		conf_fileload="load"
 	else
 		if [ "x${conf_boot_fstype}" = "xfat" ] ; then