From f23e178337c1c0787171f2b1ab5614ac1915ef8f Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 1 Dec 2022 11:45:35 -0700 Subject: meta-xilinx-core: Rename u-boot scripts and uenv packages In meta-xilinx-core u-boot-zynq-scr and u-boot-zynq-uenv recipes are renamed to u-boot-xlnx-scr and u-boot-xlnx-uenv. Hence change these in all the configuraiton and inclusion files. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../conf/machine/include/machine-xilinx-default.inc | 4 ++-- meta-xilinx-core/conf/machine/microblaze-generic.conf | 2 +- meta-xilinx-core/conf/machine/versal-generic.conf | 18 +++++++++--------- meta-xilinx-core/conf/machine/zynq-generic.conf | 10 +++++++++- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 6 +++--- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index 06203985..3969fa87 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc @@ -43,8 +43,8 @@ XSERVER ?= " \ # Automatically add WKS_FILE_DEPENDS based on the configuration WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'boot.bin', ' xilinx-bootbin', '', d)}" WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'system.dtb', ' virtual/dtb', '', d)}" -WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'boot.scr', ' u-boot-zynq-scr', '', d)}" -WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'uEnv.txt', ' u-boot-zynq-uenv', '', d)}" +WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'boot.scr', ' u-boot-xlnx-scr', '', d)}" +WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'uEnv.txt', ' u-boot-xlnx-uenv', '', d)}" WKS_FILE_DEPENDS:append = "${@bb.utils.contains('IMAGE_BOOT_FILES', 'atf-uboot.ub', ' arm-trusted-firmware', '', d)}" IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}" diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf index db38fb03..890bb317 100644 --- a/meta-xilinx-core/conf/machine/microblaze-generic.conf +++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf @@ -79,7 +79,7 @@ EXTRA_IMAGEDEPENDS += " \ virtual/bitstream \ virtual/bootloader \ virtual/elfrealloc \ - u-boot-zynq-scr \ + u-boot-xlnx-scr \ " IMAGE_FSTYPES += "cpio.gz" diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf index 9b9ebf31..d7797b78 100644 --- a/meta-xilinx-core/conf/machine/versal-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-generic.conf @@ -36,15 +36,15 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' WKS_FILES ?= "sdimage-bootpart.wks" EXTRA_IMAGEDEPENDS += " \ - arm-trusted-firmware \ - virtual/boot-bin \ - virtual/bootloader \ - virtual/psm-firmware \ - virtual/plm \ - u-boot-zynq-scr \ - qemu-devicetrees \ - virtual/cdo \ -" + arm-trusted-firmware \ + virtual/boot-bin \ + virtual/bootloader \ + virtual/psm-firmware \ + virtual/plm \ + u-boot-xlnx-scr \ + qemu-devicetrees \ + virtual/cdo \ + " IMAGE_BOOT_FILES += " \ boot.bin \ diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf index e8ecfb34..eaabb129 100644 --- a/meta-xilinx-core/conf/machine/zynq-generic.conf +++ b/meta-xilinx-core/conf/machine/zynq-generic.conf @@ -26,7 +26,15 @@ SERIAL_CONSOLES ?= "115200;ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" +EXTRA_IMAGEDEPENDS += " \ + virtual/boot-bin \ + virtual/fsbl \ + virtual/bootloader \ + u-boot-xlnx-scr \ + " + IMAGE_BOOT_FILES += " \ + boot.bin \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ boot.scr \ " @@ -43,7 +51,7 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@" QB_KERNEL_ROOT = "/dev/mmcblk0p2" # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) -QB_OPT_APPEND ?= " \ +QB_OPT_APPEND = " \ -serial null \ -gdb tcp::9000 \ -device loader,addr=0xf8000008,data=0xDF0D,data-len=4 \ diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index c375d8e5..1e6ee0d3 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -44,12 +44,12 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" HDF_MACHINE = "zcu102-zynqmp" EXTRA_IMAGEDEPENDS += " \ - u-boot-zynq-uenv \ + u-boot-xlnx-uenv \ arm-trusted-firmware \ qemu-devicetrees \ virtual/boot-bin \ virtual/bootloader \ - u-boot-zynq-scr \ + u-boot-xlnx-scr \ " IMAGE_BOOT_FILES += " \ @@ -84,7 +84,7 @@ QB_PMU_OPT = " \ " QB_OPT_APPEND += " -pmu-args '${QB_PMU_OPT}'" -do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy" +do_write_qemuboot_conf[depends] += "u-boot-xlnx-uenv:do_deploy" #### No additional settings should be after the Postamble #### Postamble -- cgit v1.2.3-54-g00ecf