From d9d1860dcd94a03ce3398cbd6fc7a71847204b18 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Fri, 18 Aug 2023 16:48:50 -0600 Subject: u-boot-xlnx-scr: Refactor boot scr variables to make it easier to override With the previous version by default xen variables are included in non xen use case, it would have been possible for kernel and devicetree offset can be override from meta-virtualization layer. With the new version add variables as addendum. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb index 5fe663d2..6410fc25 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb @@ -169,14 +169,8 @@ NAND_FIT_IMAGE_OFFSET ??= "0x4180000" NAND_FIT_IMAGE_OFFSET:zynq ??= "0x1080000" NAND_FIT_IMAGE_SIZE ??= "0x6400000" -# Xen boot script variables. Define here and set it from meta-virtualization -XEN_OFFSET ??= "0xBA00000" -XEN_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('XEN_OFFSET'))}" -XEN_IMAGE_NAME ??= "xen" -DOM0_MEM ??= "1500M" -XEN_SERIAL_CONSOLES ??= "serial0" -XEN_CMDLINE_APPEND ??= "" -DOM0_MAX_VCPUS ??= "1" +# Add variables as addendum. +SCRIPT_SED_ADDENDUM = "" # Default to booting with the rootfs device being partition 2 for SD/eMMC PARTNUM ?= "2" @@ -254,13 +248,7 @@ do_compile() { -e 's:@@KERNEL_ROOT_SD@@:${KERNEL_ROOT_SD}:' \ -e 's:@@KERNEL_ROOT_RAMDISK@@:${KERNEL_ROOT_RAMDISK}:' \ -e 's:@@KERNEL_COMMAND_APPEND@@:${KERNEL_COMMAND_APPEND}:' \ - -e 's/@@XEN_IMAGE_NAME@@/${XEN_IMAGE_NAME}/' \ - -e 's/@@XEN_OFFSET@@/${XEN_OFFSET}/' \ - -e 's/@@XEN_LOAD_ADDRESS@@/${XEN_LOAD_ADDRESS}/' \ - -e 's/@@DOM0_MEM@@/${DOM0_MEM}/' \ - -e 's/@@DOM0_MAX_VCPUS@@/${DOM0_MAX_VCPUS}/' \ - -e 's:@@XEN_SERIAL_CONSOLES@@:${XEN_SERIAL_CONSOLES}:' \ - -e 's:@@XEN_CMDLINE_APPEND@@:${XEN_CMDLINE_APPEND}:' \ + ${SCRIPT_SED_ADDENDUM} \ "${WORKDIR}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > "${WORKDIR}/boot.cmd" mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr -- cgit v1.2.3-54-g00ecf