1. Move xen u-boot boot script variables from xen-boot-cmd.inc to new
   xen-boot-env.inc file. This allows users to include this inclusion
   file for their custom boot scripts.
2. Include xen-boot-env.inc file if BOOTMODE="xen" and also remove xen
   u-boot boot script variables from xen-boot-cmd.inc.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-r...@amd.com>
---
 .../u-boot/u-boot-xlnx-scr.bbappend           | 13 ++++++-
 .../recipes-bsp/u-boot/xen-boot-cmd.inc       | 35 -------------------
 .../recipes-bsp/u-boot/xen-boot-env.inc       | 29 +++++++++++++++
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-env.inc

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 ec64d246..9deb8613 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,4 +1,15 @@
-# Include xen-boot-cmd.inc only if ENABLE_XEN_UBOOT_SCR is set from 
configuration
+# Include xen-boot-cmd.inc only if BOOTMODE = "xen" is set from configuration
 # file and xen enabled in DISTRO_FEATURES.
+# Note: BOOTMODE variable is defined in 
https://git.yoctoproject.org/meta-xilinx/tree/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb#n32
+# to support multiple u-boot boot target for u-boot distro boot. See below 
files
+# ZynqMP: 
https://github.com/u-boot/u-boot/blob/master/include/configs/xilinx_zynqmp.h#L160-L170
+# Versal: 
https://github.com/u-boot/u-boot/blob/master/include/configs/xilinx_versal.h#L121-L129
+# Versal Net: 
https://github.com/u-boot/u-boot/blob/master/include/configs/xilinx_versal_net.h#L117-L123
+# for u-boot distro boot.
+include ${@'xen-boot-env.inc' if d.getVar('BOOTMODE') == 'xen' and 
bb.utils.contains('DISTRO_FEATURES', 'xen', True, False, d) else ''}
+
+# Include xen-boot-cmd.inc only if ENABLE_XEN_UBOOT_SCR is set from 
configuration
+# file and xen enabled in DISTRO_FEATURES. xen-boot-cmd.inc is supports 
multiple
+# boot modes such as JTAG and SD(ext4 and ramdisk).
 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 ''}
diff --git a/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-cmd.inc 
b/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-cmd.inc
index 7a4e41a6..6fccc7b4 100644
--- a/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-cmd.inc
+++ b/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-cmd.inc
@@ -1,38 +1,3 @@
 FILESEXTRAPATHS:append := ":${THISDIR}/u-boot-xlnx-scr"
 
 SRC_URI += "file://boot.cmd.xen"
- 
-# Image offsets for Xen boot
-KERNEL_OFFSET:zynqmp ?= "0xE00000"
-KERNEL_OFFSET:versal ?= "0xE00000"
-
-DEVICETREE_OFFSET:zynqmp ?= "0xC000000"
-DEVICETREE_OFFSET:versal ?= "0xC000000"
-
-RAMDISK_OFFSET:zynqmp ?= "0x2600000"
-RAMDISK_OFFSET:versal ?= "0x2600000"
-
-XEN_OFFSET:zynqmp ?= "0xBA00000"
-XEN_OFFSET:versal ?= "0xBA00000"
-XEN_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('XEN_OFFSET'))}"
-
-# If dom0-ramdisk is used for Xen boot then set RAMDISK image to cpio.gz
-XEN_IMAGE_NAME ?= "xen"
-RAMDISK_IMAGE ?= "rootfs.cpio.gz"
-
-# Set the amount of memory for dom0 depending on total available memory 
size(DDR).
-DOM0_MEM ?= "1500M"
-
-# Specify which UART console Xen should use. You can sepecify the devicetree
-# alias or full path to a node in the devicetree
-# XEN_SERIAL_CONSOLES ?= "serial0" or XEN_SERIAL_CONSOLES ?= 
"/axi/serial@ff000000"
-XEN_SERIAL_CONSOLES ?= "serial0"
-
-# Specify additional Xen paramaters which will be appended to xen-bootargs
-# This can alos be used for debugging purposes.
-# Examples: XEN_CMDLINE_APPEND ?= "sched=credit loglvl=all guest_loglvl=debug"
-XEN_CMDLINE_APPEND ?= ""
-
-# Specify the max number of vcpus for dom0
-# Example usage: DOM0_MAX_VCPUS = "2" or DOM0_MAX_VCPUS = "2-4"
-DOM0_MAX_VCPUS ?= "1"
diff --git a/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-env.inc 
b/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-env.inc
new file mode 100644
index 00000000..9b9962a4
--- /dev/null
+++ b/dynamic-layers/xilinx/recipes-bsp/u-boot/xen-boot-env.inc
@@ -0,0 +1,29 @@
+# Adjust the variables for xen boot
+
+# Image offsets for Xen boot.
+KERNEL_OFFSET ?= "0xE00000"
+DEVICETREE_OFFSET ?= "0xC000000"
+RAMDISK_OFFSET ?= "0x2600000"
+XEN_OFFSET ?= "0xBA00000"
+XEN_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('XEN_OFFSET'))}"
+
+# If dom0-ramdisk is used for Xen boot then set RAMDISK image to cpio.gz
+XEN_IMAGE_NAME ?= "xen"
+RAMDISK_IMAGE ?= "rootfs.cpio.gz"
+
+# Set the amount of memory for dom0 depending on total available memory 
size(DDR).
+DOM0_MEM ?= "1500M"
+
+# Specify which UART console Xen should use. You can sepecify the devicetree
+# alias or full path to a node in the devicetree
+# XEN_SERIAL_CONSOLES ?= "serial0" or XEN_SERIAL_CONSOLES ?= 
"/axi/serial@ff000000"
+XEN_SERIAL_CONSOLES ?= "serial0"
+
+# Specify additional Xen paramaters which will be appended to xen-bootargs
+# This can alos be used for debugging purposes.
+# Examples: XEN_CMDLINE_APPEND ?= "sched=credit loglvl=all guest_loglvl=debug"
+XEN_CMDLINE_APPEND ?= ""
+
+# Specify the max number of vcpus for dom0
+# Example usage: DOM0_MAX_VCPUS = "2" or DOM0_MAX_VCPUS = "2-4"
+DOM0_MAX_VCPUS ?= "1"
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9045): 
https://lists.yoctoproject.org/g/meta-virtualization/message/9045
Mute This Topic: https://lists.yoctoproject.org/mt/110006798/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to