Deprecate BOARD and BOARD_VARIANT support

If the BOARD and/or BOARD_VARIANT is set, continue to allow this to
work, however warn the user it is deprecated.

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

2 files changed, 6 insertions, 5 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index e78fede1..f724bbe3 100644
--- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -3,8 +3,8 @@
 #@DESCRIPTION: Machine support for Ultra96 Evaluation Board.
 #
 
-require conf/machine/zynqmp-generic.conf
-
 MACHINE = "zynqmp-generic"
 BOARD = "ultra96"
 SOC_VARIANT = 'eg'
+
+require conf/machine/zynqmp-generic.conf
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index 1bda4cd1..2c88be62 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -3,8 +3,10 @@
 ##@DESCRIPTION: Machine support for vck190 system controller.
 
 
-require conf/machine/include/soc-zynqmp.inc
-require conf/machine/include/machine-xilinx-default.inc
+MACHINE = "zynqmp-generic"
+BOARD = "vck-sc"
+
+require conf/machine/zynqmp-generic.conf
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -25,4 +27,3 @@ IMAGE_BOOT_FILES += " \
     atf-uboot.ub \
     boot.scr \
 "
-BOARD = "vck-sc"