From c6428720d6aaaa3f3db873173b7257777fb7c752 Mon Sep 17 00:00:00 2001
From: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Date: Wed, 21 Jun 2023 18:02:39 -0600
Subject: machine: Remove BOARD overrides from xilinx bsp layer

Using BOARD variable are deprecated, hence remove it. Machine conf
files using BOARD overrides now will be replaced with machineoverrides.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-bsp/conf/machine/vck190-versal.conf  | 4 ----
 meta-xilinx-bsp/conf/machine/vck5000-versal.conf | 4 ----
 meta-xilinx-bsp/conf/machine/vmk180-versal.conf  | 4 ----
 meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf  | 4 ----
 meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf  | 4 ----
 meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf  | 4 ----
 6 files changed, 24 deletions(-)

diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 76b3cf1d..02f1c015 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -2,10 +2,6 @@
 #@NAME: vck190-versal
 #@DESCRIPTION: Machine configuration for the VCK190 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vck190:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}"
 #### Regular settings follow
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index a80788cc..e77a4cfc 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -2,10 +2,6 @@
 #@NAME: vck500-versal
 #@DESCRIPTION: Machine configuration for the VCK5000 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vck5000:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'vck5000-versal:']['vck5000-versal' !='${MACHINE}']}"
 #### Regular settings follow
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 077bf0a2..2ccbca05 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -2,10 +2,6 @@
 #@NAME: vmk180-versal
 #@DESCRIPTION: Machine configuration for the VMK180 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vmk180:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}"
 #### Regular settings follow
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 61b2bf2b..52a2a194 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu102-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU102 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu102:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 6853edb0..0cc55654 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu106-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU106 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu106:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 92e80460..493b1f13 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu111-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU111 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu111:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
-- 
cgit v1.2.3-54-g00ecf