ccimx6ulstarter: add U-Boot scripts for deploying and booting the system

- boot.txt
	Sets the device tree filename basing on the SOM variant read from
	the HWID and boots from NAND.
- install_linux_fw_sd
	Deploys a full system (as generated by Digi Embedded Yocto) from
	a FAT formatted micro SD card into the NAND flash.

The u-boot-dey recipe is now fully shared by ccimx6 and ccimx6ul platforms
so we can remove the platform-specific appends.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

meta-digi-arm/conf/machine/ccimx6ulstarter.conf

@@ -20,5 +20,8 @@ SERIAL_CONSOLES = "115200;ttymxc4"
 # Bluetooth tty
 BT_TTY ?= "ttymxc0"
 
+# U-Boot script to be copied to the boot image
+BOOT_SCRIPTS = "boot.scr:boot.scr"
+
 # Flash image types
 IMAGE_FSTYPES ?= "tar.bz2 ubifs"

meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/boot.txt

@@ -0,0 +1,23 @@
+#
+# U-Boot bootscript for NAND images created by Yocto.
+#
+
+#
+# Set device tree filename depending on the board ID (if defined)
+#
+if test -n "${board_id}"; then
+	setenv fdt_file zImage-imx6ul-ccimx6ulstarter-id${board_id}.dtb
+else
+	#
+	# Set device tree filename depending on the hardware variant
+	#
+	if test "${module_variant}" = "0x02"; then
+		setenv fdt_file zImage-imx6ul-ccimx6ulstarter-wb.dtb
+	elif test "${module_variant}" = "0x03"; then
+		setenv fdt_file zImage-imx6ul-ccimx6ulstarter.dtb
+	else
+		echo "------ Using default fdt_file: $fdt_file"
+	fi
+fi
+
+dboot linux nand

meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt

@@ -0,0 +1,105 @@
+#
+# U-Boot script for installing Linux images created by Yocto from the micro SD
+# card into the NAND
+#
+
+echo "############################################################"
+echo "#           Linux firmware install from micro SD           #"
+echo "############################################################"
+echo ""
+echo " This process will erase your NAND and will install a new"
+echo " U-Boot and Linux firmware images on the NAND."
+echo ""
+echo " Press CTRL+C now if you wish to abort or wait 10 seconds"
+echo " to continue."
+
+sleep 10
+if test $? -eq 1; then
+	echo "Aborted by user.";
+	exit;
+fi
+
+setenv INSTALL_MMCDEV 0
+setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6ulstarter.imx
+setenv INSTALL_LINUX_FILENAME core-image-base-ccimx6ulstarter.boot.ubifs
+setenv INSTALL_ROOTFS_FILENAME core-image-base-ccimx6ulstarter.ubifs
+
+# Check for presence of firmware files on the SD card
+for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do
+	if test ! -e mmc ${INSTALL_MMCDEV}:1 ${install_f}; then
+		echo "ERROR: Could not find file ${install_f}";
+		install_abort=1;
+	fi;
+done
+if test -n "${install_abort}"; then
+	echo "Aborted.";
+	exit;
+fi
+
+# Skip user confirmation for U-Boot update
+setenv forced_update 1
+
+# Set bootdelay to zero so that firmware update is run immediately after
+# the first reset.
+setenv bootdelay 0
+
+# Update U-Boot
+echo ""
+echo ""
+echo ">> Installing U-Boot boot loader (target will reset)"
+echo ""
+echo ""
+update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME}
+if test $? -eq 1; then
+	echo "[ERROR] Failed to update U-Boot boot loader!";
+	echo "";
+	echo "Aborted.";
+	exit;
+fi
+
+# Set 'bootcmd' to the second part of the script that will
+#  - Reset environment to defaults
+#  - Save the environment
+#  - Update the 'linux' partition
+#  - Update the 'rootfs' partition
+#  - Reset the system and let it boot
+setenv bootcmd "
+	env default -a;
+	saveenv;
+	echo \"\";
+	echo \"\";
+	echo \">> Installing Linux kernel and device tree files\";
+	echo \"\";
+	echo \"\";
+	update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME};
+	if test \$? -eq 1; then
+		echo \"[ERROR] Failed to update linux partition!\";
+		echo \"\";
+		echo \"Aborted.\";
+		exit;
+	fi;
+	echo \"\";
+	echo \"\";
+	echo \">> Installing Linux root file system\";
+	echo \"\";
+	echo \"\";
+	update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME};
+	if test \$? -eq 1; then
+		echo \"[ERROR] Failed to update rootfs partition!\";
+		echo \"\";
+		echo \"Aborted.\";
+		exit;
+	fi;
+	echo \"\";
+	echo \"#######################\";
+	echo \"#  Install complete!  #\";
+	echo \"#######################\";
+	echo \"\";
+	sleep 1;
+	echo \">> Restarting the system\";
+	sleep 1;
+	reset;
+"
+
+saveenv
+reset

meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb

@@ -21,7 +21,7 @@ SRC_URI = " \
     ${UBOOT_GIT_URI};branch=${SRCBRANCH} \
 "
 
-SRC_URI_append_ccimx6 = " \
+SRC_URI_append = " \
     file://boot.txt \
     file://install_linux_fw_sd.txt \
 "
@@ -136,9 +136,7 @@ do_deploy_append() {
 		done
 		unset  i
 	fi
-}
 
-do_deploy_append_ccimx6() {
 	# DEY firmware install script
 	sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt
 	mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr