meta-xilinx-bsp: Align SOC_VARIANT with PetaLinux

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

13 files changed, 18 insertions, 8 deletions

diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index 4a250ae4..d865dc5a 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -2,6 +2,8 @@
 #@NAME: v350-versal
 ##@DESCRIPTION: Machine support for v350 versal.
 
+SOC_VARIANT = "ai-core"
+
 require conf/machine/versal-generic.conf
 
 # Add board compatibility override
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index 6d1fcb3f..e8a2d5d5 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -2,6 +2,8 @@
 #@NAME: vck-sc-zynqmp 
 ##@DESCRIPTION: Machine support for vck190 system controller.
 
+SOC_VARIANT = "eg"
+
 require conf/machine/zynqmp-generic.conf
 
 # Add board compatibility override
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index f6b3ea81..52d0ffc5 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -2,6 +2,8 @@
 #@NAME: vck500-versal
 ##@DESCRIPTION: Machine support for vck5000 versal.
 
+SOC_VARIANT = "ai-core"
+
 require conf/machine/versal-generic.conf
 
 # Add board compatibility override
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 45419489..29cafa01 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -2,6 +2,8 @@
 #@NAME: vmk180-versal
 ##@DESCRIPTION: Machine support for vmk180-versal .
 
+SOC_VARIANT = "prime"
+
 require conf/machine/versal-generic.conf
 
 # Add board compatibility override
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index d8a0e3bf..c3518577 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZC1254 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 65679b77..d336043c 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -2,6 +2,8 @@
 #@NAME: zcu102-zynqmp
 #@DESCRIPTION: Machine support for ZCU102 Evaluation Board.
 
+SOC_VARIANT = "eg"
+
 require conf/machine/zynqmp-generic.conf
 
 # Add board compatibility override
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 2d2975a7..942b8978 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU104 Evaluation Board.
 #
 
-SOC_VARIANT ?= "ev"
+SOC_VARIANT = "ev"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 1c862b35..03090aa8 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -2,7 +2,7 @@
 #@NAME: zcu106-zynqmp
 #@DESCRIPTION: Machine support for ZCU106 Evaluation Board.
 
-SOC_VARIANT ?= "ev"
+SOC_VARIANT = "ev"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 4e2875f1..09ca2b33 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU111 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 4044a85f..8ae4e40c 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU1275 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index bd95dda6..b0743a44 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU1285 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index b0390cc0..0be5a3d3 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU208 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf
 
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 10f97018..cba83052 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine support for ZCU216 Evaluation Board.
 #
 
-SOC_VARIANT ?= "dr"
+SOC_VARIANT = "dr"
 
 require conf/machine/zynqmp-generic.conf