Inherit xen-launch-config bbclass to use common xen launch config variables for xen-rpi-u-boot-scr recipe.
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-r...@amd.com> --- .../xen-rpi-u-boot-scr/files/boot.cmd.xen.in | 10 +++++----- .../xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb | 13 ++++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in index 98742200..b0ed0dc8 100644 --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/files/boot.cmd.xen.in @@ -5,13 +5,13 @@ fdt addr ${fdt_addr} fdt get value bootargs /chosen bootargs # Set module load addresses -setenv xen_loadaddr "0x00200000" -setenv kernel_loadaddr "0x00400000" +setenv xen_loadaddr "@@XEN_LOAD_ADDRESS@@" +setenv kernel_loadaddr "@@KERNEL_LOAD_ADDRESS@@" # Add some space to the fdt so we can edit it fdt resize 0x1000 echo Add boot arguments for Xen -fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=/soc/serial@7e215040 dom0_mem='@@RPI_DOM0_MEM@@' @@RPI_DEBUG_XEN_ARGS@@" +fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=@@XEN_SERIAL_CONSOLES@@ dom0_mem=@@DOM0_MEM@@ @@XEN_CMDLINE_APPEND@@" echo Add a dom0 node to chosen to put Linux boot information in fdt mknode /chosen dom0 @@ -36,11 +36,11 @@ setenv dom0_bootargs "console=hvc0 earlycon=xenboot debug root=PARTUUID=${rootfs fdt set /chosen xen,dom0-bootargs \"${dom0_bootargs}\" echo Load Xen into memory -fatload mmc 1:1 ${xen_loadaddr} xen +fatload mmc 1:1 ${xen_loadaddr} @@XEN_IMAGETYPE@@ echo Xen loaded, size: 0x$filesize echo Load Linux kernel into memory -fatload mmc 1:1 ${kernel_loadaddr} Image +fatload mmc 1:1 ${kernel_loadaddr} @@KERNEL_IMAGETYPE@@ setenv kernel_size 0x$filesize echo Linux loaded, size: 0x$filesize diff --git a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb index 3f83c7f8..0b5d4201 100644 --- a/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb +++ b/dynamic-layers/raspberrypi/recipes-bsp/xen-rpi-u-boot-scr/xen-rpi-u-boot-scr.bb @@ -5,18 +5,21 @@ COMPATIBLE_MACHINE = "^raspberrypi4-64$" DEPENDS = "u-boot-mkimage-native" +inherit xen-launch-config + INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "file://boot.cmd.xen.in" -RPI_DOM0_MEM ??= "256M" -RPI_DEBUG_XEN_ARGS ??= "sync_console bootscrub=0" - do_compile() { sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \ + -e 's/@@XEN_IMAGETYPE@@/${XEN_IMAGETYPE}/' \ -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \ - -e 's/@@RPI_DOM0_MEM@@/${RPI_DOM0_MEM}/' \ - -e 's/@@RPI_DEBUG_XEN_ARGS@@/${RPI_DEBUG_XEN_ARGS}/' \ + -e 's/@@DOM0_MEM@@/${DOM0_MEM}/' \ + -e 's/@@KERNEL_LOAD_ADDRESS@@/${KERNEL_LOAD_ADDRESS}/' \ + -e 's/@@XEN_LOAD_ADDRESS@@/${XEN_LOAD_ADDRESS}/' \ + -e 's:@@XEN_CMDLINE_APPEND@@:${XEN_CMDLINE_APPEND}:' \ + -e 's:@@XEN_SERIAL_CONSOLES@@:${XEN_SERIAL_CONSOLES}:' \ "${UNPACKDIR}/boot.cmd.xen.in" > "${WORKDIR}/boot.cmd" mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9047): https://lists.yoctoproject.org/g/meta-virtualization/message/9047 Mute This Topic: https://lists.yoctoproject.org/mt/110006801/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-