vendor/xilinx: meta-xilinx-standalone-experimental: Move vendor speci…

…fic information to xilinx Move logic for vendor into vendor layer. This logic will configure Libmetal Repo (for Linux and MC builds) with existing variable instead of new one. Also ensure that support for Versal NET is present. Signed-off-by: Ben Levinsky <ben.levinsky@amd.com> Signed-off-by: Mark Hatle <mark.hatle@amd.com>
OpenAMP · Apr 23, 2024 · 37a6ae4 · 37a6ae4
1 parent b506426
commit 37a6ae4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/recipes-openamp/libmetal/libmetal.inc b/recipes-openamp/libmetal/libmetal.inc
@@ -46,7 +46,6 @@ EXTRA_OECMAKE = " \
 	-DLIBEXEC_INSTALL_DIR=${libexecdir} \
 	-DMACHINE=${LIBMETAL_MACHINE} \
 	-DWITH_EXAMPLES=ON \
-	-DSOC_FAMILY="${SOC_FAMILY}" \
 	"
 
 ALLOW_EMPTY:${PN}-demos = "1"

diff --git a/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx.inc b/vendor/xilinx/meta-xilinx-standalone-experimental/recipes-openamp/libmetal/libmetal-xlnx.inc
@@ -37,7 +37,6 @@ LIBMETAL_DEMO ?= "OFF"
 
 EXTRA_OECMAKE:armv7r = "\
     -DWITH_EXAMPLES=${LIBMETAL_DEMO} \
-    -DSOC_FAMILY=${SOC_FAMILY} \
     "
 OECMAKE_C_LINK_FLAGS:append:xilinx-standalone = " -lxilstandalone -lscugic -lxiltimer -lgcc"
 

diff --git a/vendor/xilinx/recipes-openamp/libmetal/libmetal-xlnx.inc b/vendor/xilinx/recipes-openamp/libmetal/libmetal-xlnx.inc
@@ -0,0 +1,5 @@
+LIBMETAL_DEF:zynqmp = " -DPLATFORM_ZYNQMP"
+LIBMETAL_DEF:versal = " -Dversal"
+LIBMETAL_DEF:versal-net = " -DVERSAL_NET"
+LIBMETAL_DEF ?= ""
+TARGET_CFLAGS:append = " ${LIBMETAL_DEF} "
diff --git a/vendor/xilinx/recipes-openamp/libmetal/libmetal_%.bbappend b/vendor/xilinx/recipes-openamp/libmetal/libmetal_%.bbappend
@@ -1,4 +1,5 @@
 LIBMETAL_MACHINE:versal = "zynqmp"
+LIBMETAL_MACHINE:versal-net = "zynqmp"
 
 EXTRA_OECMAKE:append:zynqmp = " -DWITH_VFIO=on"
 EXTRA_OECMAKE:append:versal = " -DWITH_VFIO=on"