Anywhere we had versal support, also now explicitly claim versal-net support.
Signed-off-by: Mark Hatle <[email protected]> --- .../esw-baremetal-hello-world.bb | 1 + .../esw-freertos-hello-world.bb | 1 + recipes-bsp/bootbin/xilinx-bootbin_1.0-xsct.inc | 12 ++++++++++++ recipes-bsp/device-tree/device-tree_xsct.inc | 1 + recipes-bsp/embeddedsw/plm-firmware_xsct.inc | 1 + recipes-bsp/embeddedsw/psm-firmware_xsct.inc | 1 + recipes-bsp/uboot-device-tree/uboot-device-tree.bb | 1 + recipes-openamp/examples/openamp-fw.inc | 2 ++ 8 files changed, 20 insertions(+) diff --git a/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb b/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb index 40113a1..d3445ed 100644 --- a/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb +++ b/recipes-apps/esw-baremetal-hello-world/esw-baremetal-hello-world.bb @@ -12,5 +12,6 @@ XSCTH_APP = "Hello World" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb b/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb index dc19870..c3b19ad 100644 --- a/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb +++ b/recipes-apps/esw-freertos-hello-world/esw-freertos-hello-world.bb @@ -12,5 +12,6 @@ XSCTH_APP = "FreeRTOS Hello World" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/bootbin/xilinx-bootbin_1.0-xsct.inc b/recipes-bsp/bootbin/xilinx-bootbin_1.0-xsct.inc index e5b8f5c..26090d1 100644 --- a/recipes-bsp/bootbin/xilinx-bootbin_1.0-xsct.inc +++ b/recipes-bsp/bootbin/xilinx-bootbin_1.0-xsct.inc @@ -5,6 +5,7 @@ DEPENDS += 'u-boot-xlnx-scr' # Only adjust the depends when on versal BOOTSCR_DEP = '' BOOTSCR_DEP:versal = 'u-boot-xlnx-scr:do_deploy' +BOOTSCR_DEP:versal-net = 'u-boot-xlnx-scr:do_deploy' do_compile[depends] .= " ${BOOTSCR_DEP}" do_compile:append:versal() { @@ -17,3 +18,14 @@ do_deploy:append:versal () { install -m 0644 ${B}/QEMU_qspi.bin ${DEPLOYDIR}/${QEMUQSPI_BASE_NAME}.bin ln -sf ${QEMUQSPI_BASE_NAME}.bin ${DEPLOYDIR}/QEMU_qspi-${MACHINE}.bin } + +do_compile:append:versal-net() { + dd if=/dev/zero bs=256M count=1 > ${B}/QEMU_qspi.bin + dd if=${B}/BOOT.bin of=${B}/QEMU_qspi.bin bs=1 seek=0 conv=notrunc + dd if=${DEPLOY_DIR_IMAGE}/boot.scr of=${B}/QEMU_qspi.bin bs=1 seek=66584576 conv=notrunc +} + +do_deploy:append:versal-net () { + install -m 0644 ${B}/QEMU_qspi.bin ${DEPLOYDIR}/${QEMUQSPI_BASE_NAME}.bin + ln -sf ${QEMUQSPI_BASE_NAME}.bin ${DEPLOYDIR}/QEMU_qspi-${MACHINE}.bin +} diff --git a/recipes-bsp/device-tree/device-tree_xsct.inc b/recipes-bsp/device-tree/device-tree_xsct.inc index c6853d6..8bd8ecc 100644 --- a/recipes-bsp/device-tree/device-tree_xsct.inc +++ b/recipes-bsp/device-tree/device-tree_xsct.inc @@ -34,6 +34,7 @@ COMPATIBLE_MACHINE:zynq = ".*" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:microblaze = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" do_configure[cleandirs] += "${DT_FILES_PATH} ${B}" do_deploy[cleandirs] += "${DEPLOYDIR}" diff --git a/recipes-bsp/embeddedsw/plm-firmware_xsct.inc b/recipes-bsp/embeddedsw/plm-firmware_xsct.inc index bf75f20..337d931 100644 --- a/recipes-bsp/embeddedsw/plm-firmware_xsct.inc +++ b/recipes-bsp/embeddedsw/plm-firmware_xsct.inc @@ -11,6 +11,7 @@ XSCTH_APP = "versal PLM" # XSCT version provides it's own toolchain, so can build in any environment COMPATIBLE_HOST:versal = "${HOST_SYS}" +COMPATIBLE_HOST:versal-net = "${HOST_SYS}" # Clear this for a Linux build, using the XSCT toolchain EXTRA_OEMAKE:linux = "" diff --git a/recipes-bsp/embeddedsw/psm-firmware_xsct.inc b/recipes-bsp/embeddedsw/psm-firmware_xsct.inc index 1361215..af9221f 100644 --- a/recipes-bsp/embeddedsw/psm-firmware_xsct.inc +++ b/recipes-bsp/embeddedsw/psm-firmware_xsct.inc @@ -11,6 +11,7 @@ XSCTH_APP = "versal PSM Firmware" # XSCT version provides it's own toolchain, so can build in any environment COMPATIBLE_HOST:versal = "${HOST_SYS}" +COMPATIBLE_HOST:versal-net = "${HOST_SYS}" # Clear this for a Linux build, using the XSCT toolchain EXTRA_OEMAKE:linux = "" diff --git a/recipes-bsp/uboot-device-tree/uboot-device-tree.bb b/recipes-bsp/uboot-device-tree/uboot-device-tree.bb index 6f6cdf5..07bc89c 100644 --- a/recipes-bsp/uboot-device-tree/uboot-device-tree.bb +++ b/recipes-bsp/uboot-device-tree/uboot-device-tree.bb @@ -23,6 +23,7 @@ COMPATIBLE_MACHINE ?= "^$" COMPATIBLE_MACHINE:zynqmp = ".*" COMPATIBLE_MACHINE:zynq = ".*" COMPATIBLE_MACHINE:versal = ".*" +COMPATIBLE_MACHINE:versal-net = ".*" XSCTH_BUILD_CONFIG ?= "" diff --git a/recipes-openamp/examples/openamp-fw.inc b/recipes-openamp/examples/openamp-fw.inc index b34bc2d..f8c61b1 100644 --- a/recipes-openamp/examples/openamp-fw.inc +++ b/recipes-openamp/examples/openamp-fw.inc @@ -14,9 +14,11 @@ COMPATIBLE_MACHINE:microblaze = "^$" COMPATIBLE_MACHINE:zynq = "${@'.*' if d.getVar('MACHINE') != 'zynq-generic' else '^$'}" COMPATIBLE_MACHINE:zynqmp = "${@'.*' if d.getVar('MACHINE') != 'zynqmp-generic' else '^$'}" COMPATIBLE_MACHINE:versal = "${@'.*' if d.getVar('MACHINE') != 'versal-generic' else '^$'}" +COMPATIBLE_MACHINE:versal-net = "${@'.*' if d.getVar('MACHINE') != 'versal-net-generic' else '^$'}" XSCTH_APP_COMPILER_FLAGS:append:zynqmp = " -mfloat-abi=hard " XSCTH_APP_COMPILER_FLAGS:append:versal = " -mfloat-abi=hard " +XSCTH_APP_COMPILER_FLAGS:append:versal-net = " -mfloat-abi=hard " YAML_BSP_CONFIG += "WITH_PROXY" YAML_BSP_CONFIG += "${@bb.utils.contains('SOC_FAMILY', 'zynq', 'extra_compiler_flags', '', d)}" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5416): https://lists.yoctoproject.org/g/meta-xilinx/message/5416 Mute This Topic: https://lists.yoctoproject.org/mt/106610007/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
