Device Tree User DTSI Includes

README.md

@@ -27,6 +27,9 @@ meta-xilinx-tools layer.
 configurations files, boot firmware, kernel configuration fragments, .scc files,
 device tree etc.
 
+* **meta-xilinx-multimedia**: layer contains AMD Xilinx specific multimedia packages
+including recipes for the fork of GStreamer.
+
 > **See:** AMD Xilinx devices:
 	https://www.xilinx.com/products/silicon-devices.html
 

meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf

@@ -3,9 +3,7 @@
 #@DESCRIPTION: Machine support for ZC1254 Evaluation Board.
 #
 
-SOC_VARIANT = "dr"
-
-require conf/machine/zynqmp-generic.conf
+require conf/machine/zynqmp-dr-generic.conf
 
 # Add board compatibility override
 MACHINEOVERRIDES .= ":zc1254"

meta-xilinx-core/classes-recipe/qemuboot-xilinx.bbclass

@@ -23,6 +23,10 @@ QB_DEFAULT_KERNEL:zynq ?= "${@'zImage' if \
 QB_DEFAULT_KERNEL:microblaze ?= "${@'simpleImage.mb' if \
 		d.getVar('INITRAMFS_IMAGE_BUNDLE') != '1' else 'simpleImage.mb-initramfs-${MACHINE}.bin'}"
 
+# https://docs.amd.com/r/en-US/ug1085-zynq-ultrascale-trm/Boot-Modes
+# https://docs.amd.com/r/en-US/ug1304-versal-acap-ssdg/Boot-Device-Modes
+QB_DEVICE_MODE ?= "-boot mode=5"
+
 inherit qemuboot
 
 def qemu_target_binary(data):
@@ -46,11 +50,12 @@ def qemu_add_extra_args(data):
     deploy_dir = data.getVar('DEPLOY_DIR_IMAGE') or ""
     machine_name = data.getVar('MACHINE') or ""
     soc_family = data.getVar('SOC_FAMILY') or ""
+    boot_mode = data.getVar('QB_DEVICE_MODE') or ""
     qb_extra_args = ''
     # Add kernel image and boot.scr to qemu boot command when initramfs_image supplied
     kernel_name = ''
     bootscr_image = '%s/boot.scr' % deploy_dir
-    if soc_family in ('zynqmp', 'versal'):
+    if soc_family in ('zynqmp', 'versal', 'versal-net'):
         kernel_name = 'Image'
         bootscr_loadaddr = '0x20000000'
     if initramfs_image:
@@ -61,11 +66,11 @@ def qemu_add_extra_args(data):
         if kernel_name:
             qb_extra_args = ' -device loader,file=%s,addr=%s,force-raw=on' % (kernel_image, kernel_loadaddr)
             qb_extra_args += ' -device loader,file=%s,addr=%s,force-raw=on' % (bootscr_image, bootscr_loadaddr)
-        if soc_family == 'versal':
-            qb_extra_args += ' -boot mode=5'
+        if soc_family in ('versal', 'versal-net'):
+            qb_extra_args += ' %s' % boot_mode
     else:
-        if soc_family in ('zynqmp', 'versal'):
-            qb_extra_args = ' -boot mode=5'
+        if soc_family in ('zynqmp', 'versal', 'versal-net'):
+            qb_extra_args = ' %s' % boot_mode
     return qb_extra_args
 
 def qemu_rootfs_params(data, param):
@@ -75,7 +80,6 @@ def qemu_rootfs_params(data, param):
     tune_features = (data.getVar('TUNE_FEATURES') or []).split()
     if 'microblaze' in tune_features:
         soc_family = 'microblaze'
-    soc_variant = data.getVar('SOC_VARIANT') or ""
 
     if param == 'rootfs':
         return 'none' if bundle_image == "1" else ''
@@ -85,7 +89,8 @@ def qemu_rootfs_params(data, param):
             "microblaze": "cpio.gz",
             "zynq": "cpio.gz",
             "zynqmp": "cpio.gz.u-boot",
-            "versal": "cpio.gz.u-boot.qemu-sd-fatimg"
+            "versal": "cpio.gz.u-boot.qemu-sd-fatimg",
+            "versal-net": "cpio.gz.u-boot.qemu-sd-fatimg"
         }
         if not initramfs_image:
             image_fs = data.getVar('IMAGE_FSTYPES')
@@ -99,7 +104,7 @@ def qemu_rootfs_params(data, param):
         sd_index = "1"
         if soc_family == 'zynq':
             sd_index = "0"
-        if soc_family == 'versal' and soc_variant == 'net':
+        if soc_family == 'versal-net':
             sd_index = "0"
 
         # Device is using a disk

meta-xilinx-core/conf/layer.conf

@@ -44,7 +44,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 
 XILINX_RELEASE_VERSION ??= "v2024.1"
 
-BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION"
+BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION"
 
 DEFAULT_XILINX_QEMU = "qemu-xilinx"
 DEFAULT_XILINX_QEMU:arm = "qemu"

meta-xilinx-core/conf/machine/README

@@ -132,8 +132,6 @@ easiy make a local change, if allowed by the machine .conf:
 
 UBOOT_MACHINE - The defconfig for u-boot.  (Note, this may be an error TBD).
 
-SOC_VARIANT - See include/soc-*.inc (Note, most machines this is fixed).
-
 
 The following variables must be set AFTER the 'require' line, using '='
 or '+='/'=+' as required.  Using ':append', ':prepend', or ':remove' will

meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc

@@ -34,24 +34,6 @@ UBOOT_SUFFIX ?= "bin"
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 UBOOT_ELF ?= "u-boot.elf"
 
-# libmali is selected by DISTRO_FEATURE of libmali & MACHINE_FEATURES of mali400
-# lima is selected by DISTRO_FEATURE != libmali & MACHINE_FEATURES of mali400
-# default mesa because otherwise
-def xlnx_is_libmali_enabled(d):
-    if bb.utils.contains('MACHINE_FEATURES', 'mali400', '1', '', d) == '1':
-        if bb.utils.contains('DISTRO_FEATURES', 'libmali', '1', '', d) == '1':
-            return True
-    return False
-
-# libmali requires certain preferred providers to be selected
-PREFERRED_PROVIDER_virtual/egl ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgl ?= "${@'mesa-gl' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgles3 ?= "${@'NOT_SUPPORTED' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/libgbm ?= "${@'libmali-xlnx' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-PREFERRED_PROVIDER_virtual/mesa ?= "${@'mesa-gl' if xlnx_is_libmali_enabled(d) else 'mesa'}"
-
 XSERVER ?= " \
 	xserver-xorg \
 	xf86-input-evdev \

meta-xilinx-core/conf/machine/include/soc-versal-net.inc

@@ -0,0 +1,26 @@
+DEFAULTTUNE ?= "cortexa72-cortexa53"
+SOC_FAMILY ?= "versal-net"
+
+require conf/machine/include/soc-family.inc
+require soc-tune-include.inc
+
+# Linux Configuration
+KERNEL_IMAGETYPE ?= "Image"
+
+WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware"
+
+UBOOT_ELF ?= "u-boot.elf"
+
+# Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version
+# The Linux compatible plm/psm-firmware though requires meta-xilinx-tools
+PLM_DEPENDS ??= ""
+PLM_MCDEPENDS ??= ""
+PLM_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PLM_IMAGE_NAME ??= "plm-${MACHINE}"
+PLM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+
+PSM_DEPENDS ??= ""
+PSM_MCDEPENDS ??= ""
+PSM_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
+PSM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"

meta-xilinx-core/conf/machine/include/soc-versal.inc

@@ -1,17 +1,15 @@
 DEFAULTTUNE ?= "cortexa72-cortexa53"
 SOC_FAMILY ?= "versal"
 
-# Available SOC_VARIANT's for versal:
-# "prime"    - Versal deafult Prime Devices
-# "premium"  - Versal Premium Devices
-# "hbm"      - Versal HMB Devices
-# "ai-core"  - Versal AI-core Devices
-# "ai-edge"  - Versal AI-Edge Devices
-# "net"      - Versal Net Devices
-
-SOC_VARIANT ?= "prime"
-
-require xilinx-soc-family.inc
+# Available MACHINE_FETURES for versal processors:
+# prime   - (none)
+# premium - aie
+# hbm     - (none)
+# ai-core - aie, vdu
+# ai-edge - aie, vdu
+# net     - none
+
+require conf/machine/include/soc-family.inc
 require soc-tune-include.inc
 
 # Linux Configuration

meta-xilinx-core/conf/machine/include/soc-zynq.inc

@@ -1,13 +1,7 @@
 DEFAULTTUNE ?= "cortexa9thf-neon"
 SOC_FAMILY ?= "zynq"
 
-# Available SOC_VARIANT's for zynq:
-# 7zs - Zynq-7000 Single A9 Core
-# 7z  - Zynq-7000 Dual A9 Core
-
-SOC_VARIANT ?= "7z"
-
-require xilinx-soc-family.inc
+require conf/machine/include/soc-family.inc
 require soc-tune-include.inc
 
 # Linux Configuration