mk_mmc.sh: drop uenvcmd override

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

hwpack/imx6q-sabrelite.conf

@@ -21,34 +21,29 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #allows using "load" over "fatload"/"ext2load"
 conf_uboot_CONFIG_CMD_FS_GENERIC=1
 
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
 #can the bootloader auto detect the device: (*.dtb)?
 #uboot_fdt_auto_detection=1
 
 conf_uboot_bootscript="6x_bootscript"
 
-#Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
-kernel_subarch="armv7"
-kernel_repo="STABLE"
-#kernel_repo="TESTING"
-
-usbnet_mem=
-
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x10008000"
 conf_loadaddr="0x12000000"
 conf_fdtaddr="0x11000000"
 #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
 conf_initrdaddr="0x12A00000"
+
+#Kernel:
+#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
+kernel_subarch="armv7"
+kernel_repo="STABLE"
+#kernel_repo="TESTING"
 dtb="imx6q-sabrelite.dtb"
+usbnet_mem=
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
-
-di_kms_mode=enable
-
-conf_note_bootloader="http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite+SPI+Flash+Recovery"
+drm_device_identifier="HDMI-A-1"
+di_serial_mode=enable
+conf_note="Required: http://boundarydevices.com/u-boot-2014-04-release-mx6/"
+#

hwpack/tegra124-jetson-tk1.conf

@@ -21,34 +21,28 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
 #allows using "load" over "fatload"/"ext2load"
 conf_uboot_CONFIG_CMD_FS_GENERIC=1
 
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
 #can the bootloader auto detect the device: (*.dtb)?
 #uboot_fdt_auto_detection=1
 
 conf_uboot_bootscript="boot.scr"
 
-#Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7-lpae
-kernel_subarch="armv7-lpae"
-kernel_repo="STABLE"
-#kernel_repo="TESTING"
-
-usbnet_mem=
-
 #Kernel: Bootloader Settings:
 conf_zreladdr="0x81000000"
 conf_loadaddr="0x80408000"
 conf_fdtaddr="0x82000000"
 conf_initrdaddr="0x82100000"
+
+#Kernel:
+#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7-lpae
+kernel_subarch="armv7-lpae"
+kernel_repo="STABLE"
+#kernel_repo="TESTING"
 dtb="tegra124-jetson-tk1.dtb"
+usbnet_mem=
 
 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"
 #

mk_mmc.sh

@@ -306,7 +306,7 @@ boot_uenv_txt_template () {
 		optargs=VIDEO_CONSOLE
 
 		mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot} rootfstype=\${mmcrootfstype}
-		${conf_entrypt}=run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
+		uenvcmd=run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 	__EOF__
 
@@ -335,7 +335,7 @@ boot_uenv_txt_template () {
 
 		optargs=${conf_optargs}
 		mmcargs=setenv bootargs console=\${console} \${optargs} \${kms_force_mode} root=\${mmcroot}
-		${conf_entrypt}=run xyz_message; run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
+		uenvcmd=run xyz_message; run boot_fdt; run mmcargs; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr}
 
 	__EOF__
 
@@ -1002,7 +1002,7 @@ populate_boot () {
 
 	if [ "${conf_uboot_bootscript}" ] ; then
 		case "${dtb}" in
-		imx6q-sabrelite.dtb)
+		imx6q-nitrogen6x.dtb|imx6q-sabrelite.dtb)
 			cat > ${TEMPDIR}/bootscripts/loader.cmd <<-__EOF__
 				echo "${conf_uboot_bootscript} -> uEnv.txt wrapper..."
 				setenv bootpart \$disk:1
@@ -1254,19 +1254,6 @@ process_dtb_conf () {
 			conf_fileload="ext2load"
 		fi
 	fi
-
-	if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
-		if [ "${conf_uboot_use_uenvcmd}" ] ; then
-			conf_entrypt="uenvcmd"
-		else
-			if [ ! "x${conf_uboot_no_uenvcmd}" = "x" ] ; then
-				conf_entrypt="${conf_uboot_no_uenvcmd}"
-			else
-				echo "Error: [conf_uboot_no_uenvcmd] not defined, stopping..."
-				exit
-			fi
-		fi
-	fi
 }
 
 check_dtb_board () {