FYI: I was waiting on answers to these questions, and a possible v3 before merging.
Bruce On Tue, Jan 7, 2025 at 10:33 AM Christopher Clark < [email protected]> wrote: > On Mon, Dec 9, 2024 at 2:54 PM Sandeep Gundlupet Raju via > lists.yoctoproject.org <sandeep.gundlupet-raju= > [email protected]> wrote: > >> Inherit xen-launch-config bbclass to use common xen launch config >> variables for xen-rpi-u-boot-scr recipe. >> > > There is a functional change in this commit that would be appropriate to > mention in the commit message: > it introduces the use of KERNEL_IMAGETYPE to identify the dom0 linux > kernel file whereas it was previously assumed to be 'Image'. > > I think this is an improvement, though I'm not able to test it at the > moment. > > >> >> Signed-off-by: Sandeep Gundlupet Raju <[email protected]> >> --- >> .../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@@" >> > > Is there a way to ensure that if XEN_SERIAL_CONSOLES is unset that the > dtuart= argument is not passed, and likewise for DOM0_MEM and the dom0_mem= > argument? > > Christopher > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9098): https://lists.yoctoproject.org/g/meta-virtualization/message/9098 Mute This Topic: https://lists.yoctoproject.org/mt/110006801/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
