From 195e1fa9fb13b21bc41af4e0747d4646caeb65e5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 4 Jun 2024 16:51:04 -0600 Subject: various: Remove SOC_VARIANT, split versal and versal-net, add machine_features SOC_VARIANT has been remove, we are now only using the YP standard SOC_FAMILY configuration. The defined families are: zynq, zynqmp, versal and versal-net. Our decision of breaking up versal-net from versal, is based on the SoC CPU changes from cortexa72/r5 to cortexa78/r52, thus we're treating it as a different SoC family. In order to capture the individual capabilities that we used to handle via SOC_VARIANT, we have defined the following features (some may have been previously defined): - mali400 (zynqmp eg and ev) - vcu (zynqmp ev) - rfsoc (zynqmp dr RF capabiltiies) - aie - (versal ai & premium) - vdu - (versal ai) SOC_VARIANT_ARCH and SOC_FAMILY_ARCH are now obsolete and replaced by MACHINE_ARCH. This is based on the guideline that any recipes that use MACHINE_FEATURES should be MACHINE_ARCH specific. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-xilinx-core/recipes-apps') diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb index 1f1d0606..63718813 100644 --- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb +++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb @@ -17,8 +17,9 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:zynqmp = "zynqmp" COMPATIBLE_MACHINE:versal = "versal" +COMPATIBLE_MACHINE:versal-net = "versal-net" -PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}" +PACKAGE_ARCH:zynqmp = "${MACHINE_ARCH}" # Force the make system to use the flags we want! EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all' -- cgit v1.2.3-54-g00ecf