u-boot-zynq-uenv.bb: Add recipe to generate uEnv.txt environment

Add a recipe to generate uEnv.txt environments for SD boot of Zynq
targets. This replaces the existing uEnv.txt for zc702/zedboard that
were manually created and populated only for u-boot-xlnx builds.

The generated uEnv.txt files also support auto loading of the fpga
bitstream before the kernel.

Also enable the use of this recipe for all *-zynq7 machines that use
U-Boot and have SD/eMMC available. And additionally setup
IMAGE_BOOT_FILES for these machines.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>

7 files changed, 38 insertions, 4 deletions

diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf
index 8e24d5f5..ec28c3ff 100644
--- a/conf/machine/microzed-zynq7.conf
+++ b/conf/machine/microzed-zynq7.conf
@@ -12,9 +12,15 @@ MACHINE_FEATURES = "ext2 vfat usbhost"
 UBOOT_MACHINE = "zynq_microzed_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
-IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
+IMAGE_BOOT_FILES += " \
+                boot.bin \
+                ${MACHINE}.dtb \
+                uEnv.txt \
+                "
 
diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf
index e1d723c4..2fb310b9 100644
--- a/conf/machine/picozed-zynq7.conf
+++ b/conf/machine/picozed-zynq7.conf
@@ -16,9 +16,15 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 UBOOT_MACHINE = "zynq_picozed_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 
-IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb"
+IMAGE_BOOT_FILES += " \
+                boot.bin \
+                ${MACHINE}.dtb \
+                uEnv.txt \
+                "
 
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 503caa31..ef423013 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -19,6 +19,8 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 UBOOT_MACHINE = "zynq_zc702_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zc702.dtb"
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 1aff9d09..0df5aa71 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -19,8 +19,16 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 UBOOT_MACHINE = "zynq_zc706_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zc706.dtb"
 KERNEL_FEATURES += "features/rtc/rtc.scc"
 
+IMAGE_BOOT_FILES += " \
+                boot.bin \
+                ${KERNEL_IMAGETYPE}-zynq-zc706.dtb \
+                uEnv.txt \
+                "
+
diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf
index 90dc993b..58cee372 100644
--- a/conf/machine/zedboard-zynq7.conf
+++ b/conf/machine/zedboard-zynq7.conf
@@ -16,6 +16,8 @@ require conf/machine/include/machine-xilinx-board.inc
 UBOOT_MACHINE = "zynq_zed_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zed.dtb"
diff --git a/conf/machine/zybo-linux-bd-zynq7.conf b/conf/machine/zybo-linux-bd-zynq7.conf
index a5505c06..d44575bd 100644
--- a/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/conf/machine/zybo-linux-bd-zynq7.conf
@@ -21,11 +21,15 @@ UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY = "spl/boot.bin"
 FORCE_PLATFORM_INIT = "1"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 EXTRA_IMAGEDEPENDS += "virtual/bitstream"
 
-IMAGE_BOOT_FILES += "boot.bin \
+IMAGE_BOOT_FILES += " \
+                boot.bin \
                 ${MACHINE}.dtb \
                 bitstream \
+                uEnv.txt \
                 "
 
 KERNEL_FEATURES += " \
diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf
index 361d7ccd..ddddfba1 100644
--- a/conf/machine/zybo-zynq7.conf
+++ b/conf/machine/zybo-zynq7.conf
@@ -16,9 +16,15 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY = "spl/boot.bin"
 
+EXTRA_IMAGEDEPENDS += "u-boot-zynq-uenv"
+
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 KERNEL_DEVICETREE = "zynq-zybo.dtb"
 
-IMAGE_BOOT_FILES += "boot.bin ${KERNEL_IMAGETYPE}-zynq-zybo.dtb"
+IMAGE_BOOT_FILES += " \
+                boot.bin \
+                ${KERNEL_IMAGETYPE}-zynq-zybo.dtb \
+                uEnv.txt \
+                "