On 11/20/2024 9:42 PM, Bruce Ashfield via lists.yoctoproject.org wrote:
In message: [meta-virtualization][master][scarthgap][styhead][PATCH 4/6]
u-boot-xlnx-scr: Include xen-boot-env if BOOTMODE is xen
on 18/11/2024 Sandeep Gundlupet Raju wrote:
Include xen-boot-env.inc file if BOOTMODE="xen" and also remove xen
u-boot boot script variables from xen-boot-cmd.inc.
Is the BOOMODE variable documented somewhere ? In the main
uboot recipes ?
[Sandeep]: Bruce, Variable is defined in
https://github.com/Xilinx/meta-xilinx/blob/master/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb#L32-L33
to support multiple u-boot boot target
https://github.com/Xilinx/u-boot-xlnx/blob/master/include/configs/xilinx_versal.h#L124-L132
for u-boot distro boot. I don't think we have a documentation defining
all the variables.
Bruce
Signed-off-by: Sandeep Gundlupet Raju <[email protected]>
---
.../u-boot/u-boot-xlnx-scr.bbappend | 7 +++-
.../recipes-bsp/u-boot/xen-boot-cmd.inc | 35 -------------------
2 files changed, 6 insertions(+), 36 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 ec64d246..4e39c316 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,9 @@
-# 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.
+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"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8996):
https://lists.yoctoproject.org/g/meta-virtualization/message/8996
Mute This Topic: https://lists.yoctoproject.org/mt/109660021/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
