u-boot-zynq-scr: reworking boot.scr recipe to work for zynq and zynqmp

Separating out sample boot.cmd file for the three supported arch (zynq,
zynqmp, versal), Updating devicetree, kernel, ramdisk load addresses for
zynq, and dynamically setting DEVICE_TREE_NAME to either system.dtb or
kernel dtb, depending on if dtg is used or not.

This u-boot-zynq-scr implementation is put in to set the default boot
and boot quicker than having to wait for the distro_bootcmd to cycle to
the correct boot medium. For example, zynq arch has boot_targets set to
"mmc mmc0 qspi usb0 pxe dhcp xilinx" and it takes about 30 seconds to
try the 'xilinx' target which will run the correct bootargs.

To use the boot.scr file, zynqmp boards must have BOOT.bin, Image,
system.dtb, and boot.scr in the boot partition and a rootfs extracted in
the second partition. Zynq boards must have BOOT.bin, uImage,
system.dtb, boot.scr, and uramdisk.image.gz in the boot partition.
(uramdisk.image.gz is the ${IMAGE}.cpio.gz.u-boot in deploy directory)

Adding u-boot-zynq-scr dependency to all zynq and zynqmp machine confs.
Conditionally adding system.dtb to IMAGE_BOOT_FILES for zcu102 to
support boot.scr in qemu flow.

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>

14 files changed, 15 insertions, 0 deletions

diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 83c5fc1e..e3e6ef56 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -20,6 +20,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index c229dac6..3f5903ba 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -24,6 +24,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index 51dd2a9d..b866316b 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -31,6 +31,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
diff --git a/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
index 1e5cd0d7..467e9009 100644
--- a/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
@@ -31,6 +31,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index fbd58a6e..b3bc1de3 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -25,6 +25,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 741ef5de..9219d57b 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -26,6 +26,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 281110d9..7812520f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -33,11 +33,13 @@ EXTRA_IMAGEDEPENDS += " \
                 qemu-devicetrees \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
                 atf-uboot.ub \
+                ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
                 "
 
 # This machine has a QEMU model, runqemu setup:
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index c4b4a032..50767514 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -31,6 +31,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 136efb90..6919891f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -29,6 +29,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 068e4890..a7970975 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -31,6 +31,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 04508540..5137c8a6 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -31,6 +31,7 @@ EXTRA_IMAGEDEPENDS += " \
                 arm-trusted-firmware \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 IMAGE_BOOT_FILES += " \
                 uEnv.txt \
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 0b0a0de2..89b8f478 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -23,6 +23,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index 87634fcc..078cced0 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -29,6 +29,7 @@ EXTRA_IMAGEDEPENDS += " \
                 virtual/boot-bin \
                 virtual/bitstream \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 732fa943..620339e2 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -24,6 +24,7 @@ EXTRA_IMAGEDEPENDS += " \
                 u-boot-zynq-uenv \
                 virtual/boot-bin \
                 virtual/bootloader \
+                u-boot-zynq-scr \
                 "
 
 SERIAL_CONSOLE = "115200 ttyPS0"