u-boot-zynq-scr: Add uEnv.txt support in bootscript

This patch will add uEnv.txt support in bootscript.

Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index 8afa1b5c..044ce5dc 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
@@ -48,7 +48,13 @@ SRC_URI = " \
             "
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit image-artifact-names
+UENV_TEXTFILE ?= "uEnv.txt"
+UENV_MMC_OFFSET_zynqmp ?= "0x200000"
+UENV_MMC_OFFSET_zynq ?= "0x2080000"
+UENV_MMC_OFFSET_versal ?= "0x80000"
+UENV_MMC_OFFSET_microblaze ?= "0x0"
+
+UENV_MMC_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('UENV_MMC_OFFSET'))}"
 
 UBOOTSCR_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
 UBOOTPXE_CONFIG ?= "pxelinux.cfg"
@@ -222,6 +228,8 @@ do_compile() {
         -e 's/@@NAND_FIT_IMAGE_SIZE@@/${NAND_FIT_IMAGE_SIZE}/' \
         -e 's/@@FIT_IMAGE@@/${FIT_IMAGE}/' \
         -e 's/@@PRE_BOOTENV@@/${PRE_BOOTENV}/' \
+        -e 's/@@UENV_MMC_LOAD_ADDRESS@@/${UENV_MMC_LOAD_ADDRESS}/' \
+        -e 's/@@UENV_TEXTFILE@@/${UENV_TEXTFILE}/' \
         -e 's/@@RAMDISK_IMAGE1@@/${RAMDISK_IMAGE1}/' \
         "${WORKDIR}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > "${WORKDIR}/boot.cmd"
     mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
index b8ebf645..a40509f9 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
@@ -7,11 +7,21 @@
 
 for boot_target in ${boot_targets};
 do
+        echo "Trying to load boot images from ${boot_target}"
         if test "${boot_target}" = "jtag" ; then
                 @@KERNEL_BOOTCMD@@ @@KERNEL_LOAD_ADDRESS@@ @@RAMDISK_IMAGE_ADDRESS@@ @@DEVICETREE_ADDRESS@@
                 exit;
         fi
         if test "${boot_target}" = "mmc0" || test "${boot_target}" = "mmc1" ; then
+                if test -e ${devtype} ${devnum}:${distro_bootpart} /@@UENV_TEXTFILE@@; then
+                        fatload ${devtype} ${devnum}:${distro_bootpart} @@UENV_MMC_LOAD_ADDRESS@@ @@UENV_TEXTFILE@@;
+                        echo "Importing environment(@@UENV_TEXTFILE@@) from ${boot_target}..."
+                        env import -t @@UENV_MMC_LOAD_ADDRESS@@ $filesize
+                        if test -n $uenvcmd; then
+                                echo Running uenvcmd ...;
+                                run uenvcmd;
+                        fi
+                fi
                 if test -e ${devtype} ${devnum}:${distro_bootpart} /@@FIT_IMAGE@@; then
                         fatload ${devtype} ${devnum}:${distro_bootpart} @@FIT_IMAGE_LOAD_ADDRESS@@ @@FIT_IMAGE@@;
                         bootm @@FIT_IMAGE_LOAD_ADDRESS@@;