[meta-xilinx] [PATCH 17/19] u-boot: Add uEnv.txt suppor to zybo-linux-bd-zynq7

[Jason Wu]

Signed-off-by: Jason Wu <jason.wu.misc at gmail.com>
---
 conf/machine/zybo-linux-bd-zynq7.conf                  | 1 +
 recipes-bsp/u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt | 2 ++
 recipes-bsp/u-boot/u-boot_2016.03.bbappend             | 4 ++++
 3 files changed, 7 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt

diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf
index 1d16430..c61c49d 100644
--- a/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/conf/machine/zybo-linux-bd-zynq7.conf
@@ -28,6 +28,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bitstream"
 
 IMAGE_BOOT_FILES += "boot.bin \
 		${@bb.utils.contains('IMAGE_FSTYPES', 'xilinx-fitimage', 'fit.itb', '${MACHINE}.dtb', d)} \
+		${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/bootloader", "u-boot", "uEnv.txt", "", d)} \
 		bitstream \
 		"
 
diff --git a/recipes-bsp/u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt b/recipes-bsp/u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt
new file mode 100644
index 0000000..72d6379
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot/zybo-linux-bd-zynq7/uEnv.txt
@@ -0,0 +1,2 @@
+bootargs=console=ttyPS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
+uenvcmd=echo Copying FIT from SD to RAM... && load mmc 0 ${load_addr} ${fit_image} && bootm ${load_addr}#conf at 2
diff --git a/recipes-bsp/u-boot/u-boot_2016.03.bbappend b/recipes-bsp/u-boot/u-boot_2016.03.bbappend
index d132ad6..774e6c9 100644
--- a/recipes-bsp/u-boot/u-boot_2016.03.bbappend
+++ b/recipes-bsp/u-boot/u-boot_2016.03.bbappend
@@ -3,6 +3,10 @@ include u-boot-spl-zynq-init.inc
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append_picozed-zynq7 = " file://ARM-zynq-Configure-picozed-to-use-custom-init.patch"
 
+SRC_URI_append_zybo-linux-bd-zynq7 = " file://uEnv.txt"
+
+UBOOT_ENV_zybo-linux-bd-zynq7 = "uEnv"
+
 SRC_URI_append = " file://zynq-Add-fpga-support-to-u-boot-SPL.patch \
 		file://configs-zynq-common-Add-uEnv.txt-support.patch \
 "
-- 
1.9.1