meta-xilinx-bsp: Covert ultra96-zynqmp and vck-sc-zynqmp from BOARD based

Use the MACHINEOVERRIDES to add the BOARD name so that overrides elsewhere
will work as expected.  Eventually the overrides will need to be adjusted.

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

2 files changed, 6 insertions, 4 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index 8f549a56..ff74ac3d 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -7,6 +7,9 @@ SOC_VARIANT = 'eg'
 
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":ultra96"
+
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu100-revC.dtb"
 
 # Affects meta-xilinx-tools xsctyaml.bbclass related items
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index 2c88be62..baaa2bd2 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -2,12 +2,11 @@
 #@NAME: vck-sc-zynqmp 
 ##@DESCRIPTION: Machine support for vck190 system controller.
 
-
-MACHINE = "zynqmp-generic"
-BOARD = "vck-sc"
-
 require conf/machine/zynqmp-generic.conf
 
+# Add board compatibility override
+MACHINEOVERRIDES .= ":vck-sc"
+
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
 UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"