From: John Vicky Vykuntapu <[email protected]> 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 <[email protected]> Signed-off-by: Mark Hatle <[email protected]> --- (v1 was directly sent to Bruce) Update in v2: Added "and" condition between xen distro enable and the ENABLE_XEN_UBOOT_SCR variable is set from the configuration file --- .../xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend | 6 ++++-- 1 file 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 ae847cb..819a0c6 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 @@ -# Include xen-boot-cmd.inc only if xen distro features is enabled. -include ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen-boot-cmd.inc', '', d)} +# Include xen-boot-cmd.inc only if ENABLE_XEN_UBOOT_SCR is set from configuration +# file and xen enabled in DISTRO_FEATURES. +ENABLE_XEN_UBOOT_SCR ?= "" +include ${@'xen-boot-cmd.inc' if d.getVar('ENABLE_XEN_UBOOT_SCR') == '1' and bb.utils.contains('DISTRO_FEATURES', 'xen', true, false, d) else ''} -- 2.44.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8882): https://lists.yoctoproject.org/g/meta-virtualization/message/8882 Mute This Topic: https://lists.yoctoproject.org/mt/108398067/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
