summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Vicky Vykuntapu <johnvicky.vykuntapu@amd.com>2024-09-11 12:20:44 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-09-11 18:19:28 +0000
commit66ee8d268db25a9f2848bda6858c284c745f549f (patch)
tree948af439e2ef7000d7255eb500910b547287fbab
parent54b806b1985f3989722ee308e1073530fe3328c1 (diff)
downloadmeta-virtualization-66ee8d268db25a9f2848bda6858c284c745f549f.tar.gz
u-boot-xlnx-scr.bbappend: Enable xen boot script using variable
Xen related boot script offset was override from meta-virtualization for non xen builds. ERROR: RD image overlaps OS image (OS=0xe00000..0x2610000) Add to include xen boot script only if ENABLE_XEN_UBOOT_SCR variable set from the configuration file and xen enabled in DISTRO_FEATURES to avoid override. Signed-off-by: John Vicky Vykuntapu <johnvicky.vykuntapu@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend6
1 files changed, 4 insertions, 2 deletions
diff --git a/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend b/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
index ae847cbc..819a0c62 100644
--- a/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
+++ b/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
@@ -1,2 +1,4 @@
1# Include xen-boot-cmd.inc only if xen distro features is enabled. 1# Include xen-boot-cmd.inc only if ENABLE_XEN_UBOOT_SCR is set from configuration
2include ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen-boot-cmd.inc', '', d)} 2# file and xen enabled in DISTRO_FEATURES.
3ENABLE_XEN_UBOOT_SCR ?= ""
4include ${@'xen-boot-cmd.inc' if d.getVar('ENABLE_XEN_UBOOT_SCR') == '1' and bb.utils.contains('DISTRO_FEATURES', 'xen', true, false, d) else ''}