meta-xilinx-bsps: Add board-style overrides to select correct components

Add the override expected by device-tree and other recipes to each machine.

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

17 files changed, 50 insertions, 0 deletions

diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index 176183a6..4a250ae4 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -4,6 +4,9 @@
 
 require conf/machine/versal-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":v350"
+
 EXTRA_IMAGEDEPENDS += " \
    arm-trusted-firmware \
    virtual/boot-bin \
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index c444105d..c20166e3 100644
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -5,3 +5,6 @@
 SOC_VARIANT = "ai-core"
 
 require conf/machine/versal-generic.conf
+
+# Add board compatibility override
+MACHINEOVERRIDES .= ":vc-p-a2197-00"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 8db3bd99..1ebaa889 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -5,3 +5,6 @@
 SOC_VARIANT = "ai-core"
 
 require conf/machine/versal-generic.conf
+
+# Add board compatibility override
+MACHINEOVERRIDES .= ":vck190"
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index eaf9ae7b..f6b3ea81 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -3,3 +3,6 @@
 ##@DESCRIPTION: Machine support for vck5000 versal.
 
 require conf/machine/versal-generic.conf
+
+# Add board compatibility override
+MACHINEOVERRIDES .= ":vck5000"
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index b951652a..45419489 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -4,3 +4,5 @@
 
 require conf/machine/versal-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":vmk180"
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index 0a34ea77..d8a0e3bf 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -7,4 +7,7 @@ SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zc1254"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zc1254-revA.dtb"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index e7d7faac..b020936e 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -11,6 +11,9 @@
 
 require conf/machine/zynq-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zc702"
+
 KERNEL_DEVICETREE = "zynq-zc702.dtb"
 
 IMAGE_BOOT_FILES += " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 33071f17..7648dd75 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -11,6 +11,9 @@
 
 require conf/machine/zynq-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zc706"
+
 SPL_BINARY ?= "spl/boot.bin"
 
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 2780312a..65679b77 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -4,4 +4,7 @@
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu102"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb"
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 65ba28b8..2d2975a7 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -7,6 +7,9 @@ SOC_VARIANT ?= "ev"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu104"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb"
 
 MACHINE_HWCODECS = "libomxil-xlnx"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index eff97a2f..1c862b35 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -6,6 +6,9 @@ SOC_VARIANT ?= "ev"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu106"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb"
 
 MACHINE_HWCODECS = "libomxil-xlnx"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 6001af5f..4e2875f1 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -7,4 +7,7 @@ SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu111"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu111-revA.dtb"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 96ddc28f..4044a85f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -7,4 +7,7 @@ SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu1275"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1275-revB.dtb"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 01c9789e..bd95dda6 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -7,4 +7,7 @@ SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu1285"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb"
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index d013d468..b0390cc0 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -6,3 +6,6 @@
 SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
+
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu208"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index ae4c434b..10f97018 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -6,3 +6,6 @@
 SOC_VARIANT ?= "dr"
 
 require conf/machine/zynqmp-generic.conf
+
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zcu216"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index c7c2f7eb..4da6bb4e 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -10,6 +10,9 @@
 
 require conf/machine/zynq-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":zedboard"
+
 SPL_BINARY ?= "spl/boot.bin"
 
 KERNEL_DEVICETREE = "zynq-zed.dtb"