u-boot-xlnx-scr: Enable addendum if BOOTMODE is xen

Enable SCRIPT_SED_ADDENDUM if BOOTMODE is set to xen by including
mxv-xen-boot-cmd inclusion file to u-boot-xlnx-scr bbappend.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/meta-xilinx-virtualization/recipes-bsp/u-boot/mxv-xen-boot-cmd.inc b/meta-xilinx-virtualization/recipes-bsp/u-boot/mxv-xen-boot-cmd.inc
index 81f9c5f2..7330bfd2 100644
--- a/meta-xilinx-virtualization/recipes-bsp/u-boot/mxv-xen-boot-cmd.inc
+++ b/meta-xilinx-virtualization/recipes-bsp/u-boot/mxv-xen-boot-cmd.inc
@@ -1,5 +1,5 @@
 # Add xen variables as addendum.
-# Variable SCRIPT_SED_ADDENDUM id defined in meta-xilinx and set to null by
+# Variable SCRIPT_SED_ADDENDUM is defined in meta-xilinx and set to null by
 # default and enable only for xen builds.
 SCRIPT_SED_ADDENDUM += "-e 's/@@XEN_IMAGE_NAME@@/${XEN_IMAGE_NAME}/' \
         -e 's/@@XEN_OFFSET@@/${XEN_OFFSET}/' \
diff --git a/meta-xilinx-virtualization/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend b/meta-xilinx-virtualization/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
index c8a21b3b..528cd834 100644
--- a/meta-xilinx-virtualization/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
+++ b/meta-xilinx-virtualization/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend
@@ -1,5 +1,3 @@
-# Include xen-boot-cmd.inc only if ENABLE_XEN_UBOOT_SCR is set from configuration
+# Include mxv-xen-boot-cmd.inc only if BOOTMODE = "xen" is set from configuration
 # file and xen enabled in DISTRO_FEATURES.
-ENABLE_XEN_UBOOT_SCR ?= ""
-include ${@'mxv-xen-boot-cmd.inc' if d.getVar('ENABLE_XEN_UBOOT_SCR') == '1' and bb.utils.contains('DISTRO_FEATURES', 'xen', True, False, d) else ''}
-
+include ${@'mxv-xen-boot-cmd.inc' if d.getVar('BOOTMODE') == 'xen' and bb.utils.contains('DISTRO_FEATURES', 'xen', True, False, d) else ''}