xilinx-deprecated: Remove support for BOARD and BOARD VARIANT

We still warn the user.  This will likely be moved to fatal in the near
future, but this would impact some automated test cases so preserve it as
a warning for now.

Also remove all of the support infrastructure for the BOARD/BOARD_VARIANT
values.

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

7 files changed, 1 insertions, 116 deletions

diff --git a/meta-xilinx-core/classes/xilinx-deprecated.bbclass b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
index b9a44fc7..2e372a9b 100644
--- a/meta-xilinx-core/classes/xilinx-deprecated.bbclass
+++ b/meta-xilinx-core/classes/xilinx-deprecated.bbclass
@@ -7,62 +7,7 @@ xilinx_deprecated_config_eventhandler[eventmask] = "bb.event.ConfigParsed"
 python xilinx_deprecated_config_eventhandler () {
     # Check for BOARD & BOARD_VARIANT usage
     if d.getVar('BOARD') or d.getVar('BOARD_VARIANT'):
-        bb.warn("Deprecated BOARD (%s) or BOARD_VARIANT (%s) is being used." % (d.getVar('BOARD'), d.getVar('BOARD_VARIANT')))
-
-        if d.getVar('MACHINE') != d.getVar('ORIG_MACHINE'):
-            if d.getVar('BOARD_VARIANT') or d.getVar('BOARD') == d.getVar('MACHINE'):
-                if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
-                    mach_path = os.path.join(d.getVar('TOPDIR'), "conf/machine", d.getVar('MACHINE') + '.conf')
-                    bb.utils.mkdirhier(os.path.dirname(mach_path))
-                    bb.warn('Generating (board_variant) MACHINE file: %s' % mach_path)
-                    with open(mach_path, "w") as f:
-                        f.write('#@TYPE: Machine\n')
-                        f.write('#@NAME: %s\n' % d.getVar('MACHINE'))
-                        f.write('#@DESCRIPTION: Generated %s machine\n' % d.getVar('MACHINE'))
-                        f.write('\n')
-                        f.write('#### Preamble\n')
-                        f.write('''MACHINEOVERRIDES =. "${@['', '%s:']['%s' != '${MACHINE}']}"\n''' % (d.getVar('MACHINE'), d.getVar('MACHINE')))
-                        f.write('#### Regular settings follow\n')
-                        f.write('\n')
-                        f.write('unset BOARD\n')
-                        f.write('unset BOARD_VARIANT\n')
-                        f.write('\n')
-                        f.write('DEFAULTTUNE ?= "%s"\n' % d.getVar('DEFAULTTUNE'))
-                        if d.getVar('TUNE_FEATURES:tune-microblaze'):
-                            f.write('TUNE_FEATURES:tune-microblaze ?= "%s"\n' % d.getVar('TUNE_FEATURES'))
-                        if d.getVar('SOC_VARIANT'):
-                            f.write('SOC_VARIANT ?= "%s"\n' % d.getVar('SOC_VARIANT'))
-                        f.write('\n')
-                        f.write('require conf/machine/%s.conf\n' % [d.getVar('ORIG_MACHINE'), d.getVar('BOARD')][bool(d.getVar('BOARD_VARIANT'))])
-                        f.write('\n')
-                        f.write('#### No additional settings should be after the Postamble\n')
-                        f.write('#### Postamble\n')
-                        f.write('''PACKAGE_EXTRA_ARCHS:append = "${@['', ' %s']['%s' != "${MACHINE}"]}"\n''' % ((d.getVar('MACHINE_ARCH'), d.getVar('MACHINE'))))
-                    bb.warn('Note: The generated machine conf file may be incomplete.  If so copy the missing settings from the original conf files.')
-                bb.warn('In the future use: MACHINE = "%s"' % d.getVar('MACHINE'))
-            if d.getVar('BOARD') and d.getVar('BOARD') != d.getVar('MACHINE'):
-                if not check_conf_exists("conf/machine/${BOARD}.conf", d):
-                    mach_path = os.path.join(d.getVar('TOPDIR'), "conf/machine", d.getVar('BOARD') + '.conf')
-                    bb.utils.mkdirhier(os.path.dirname(mach_path))
-                    bb.warn('Generating (board) MACHINE file: %s' % mach_path)
-                    with open(mach_path, "w") as f:
-                        f.write('#@TYPE: Machine\n')
-                        f.write('#@NAME: %s\n' % d.getVar('BOARD'))
-                        f.write('#@DESCRIPTION: Generated %s machine\n' % d.getVar('BOARD'))
-                        f.write('\n')
-                        f.write('#### Preamble\n')
-                        f.write('''MACHINEOVERRIDES =. "${@['', '%s:']['%s' != '${MACHINE}']}"\n''' % (d.getVar('BOARD'), d.getVar('BOARD')))
-                        f.write('#### Regular settings follow\n')
-                        f.write('\n')
-                        f.write('unset BOARD\n')
-                        f.write('unset BOARD_VARIANT\n')
-                        f.write('require conf/machine/%s.conf\n' % d.getVar('ORIG_MACHINE'))
-                        f.write('\n')
-                        f.write('#### No additional settings should be after the Postamble\n')
-                        f.write('#### Postamble\n')
-                        f.write('''PACKAGE_EXTRA_ARCHS:append = "${@['', ' %s']['%s' != "${MACHINE}"]}"\n''' % ((d.getVar('BOARD_ARCH'), d.getVar('BOARD'))))
-                    bb.warn('Note: The generated machine conf file may be incomplete.  If so copy the missing settings from the original conf files.')
-            d.delVar('ORIG_MACHINE')
+        bb.warn("Deprecated BOARD (%s) or BOARD_VARIANT (%s) is being used, they are no longer supported and are ignored." % (d.getVar('BOARD'), d.getVar('BOARD_VARIANT')))
 
     msg_list = d.getVarFlags('XILINX_DEPRECATED') or []
     for msg_source in msg_list:
diff --git a/meta-xilinx-core/conf/machine/include/xilinx-board-post.inc b/meta-xilinx-core/conf/machine/include/xilinx-board-post.inc
deleted file mode 100644
index 6f05eddd..00000000
--- a/meta-xilinx-core/conf/machine/include/xilinx-board-post.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-BOARD_ARCH ?= "${@['${BOARD}', '${MACHINE_ARCH}'][d.getVar('BOARD')=='']}"
-BOARDVARIANT_ARCH ?= "${@['${BOARD}_${BOARD_VARIANT}','${BOARD_ARCH}'][d.getVar('BOARD_VARIANT')=='']}"
-
-PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${BOARD_ARCH}']['${BOARD}' != '' and '${BOARD_ARCH}' != '${MACHINE_ARCH}']}"
-# We don't add BOARDVARIANT_ARCH as that will be automatic via MACHINE
-#PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${BOARDVARIANT_ARCH}']['${BOARD_VARIANT}' != '' and '${BOARDVARIANT_ARCH}' != '${MACHINE_ARCH}']}"
diff --git a/meta-xilinx-core/conf/machine/include/xilinx-board-pre.inc b/meta-xilinx-core/conf/machine/include/xilinx-board-pre.inc
deleted file mode 100644
index 8fea5ce2..00000000
--- a/meta-xilinx-core/conf/machine/include/xilinx-board-pre.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-BOARD ??= ""
-BOARD_VARIANT ??= ""
-
-# Change the MACHINE to the BOARD-VARIANT (or BOARD)
-ORIG_MACHINE := "${MACHINE}"
-MACHINE := "${@['${BOARD}-${BOARD_VARIANT}', '${BOARD}' or '${ORIG_MACHINE}']['${BOARD_VARIANT}' == '']}"
-
-# Add the BOARD and BOARD_VARIANT to the overrides
-MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '' and '${MACHINE}' != '${BOARD}']}"
-# We don't add BOARD-BOARD_VARIANT as that will be automatic via MACHINE
-#MACHINEOVERRIDES =. "${@['', '${BOARD}-${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '' and '${MACHINE}' != '${BOARD_VARIANT}']}"
-
-include conf/machine/include/${BOARD}.inc
-include conf/machine/include/${BOARD}-${BOARD_VARIANT}.inc
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index eeade810..5a6bd084 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: microblaze-generic
 #@DESCRIPTION: Machine configuration for the microblaze-generic devices
 
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'microblaze-generic:']['microblaze-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -97,8 +92,3 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
-
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 7811073b..eb06426f 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: versal-generic
 #@DESCRIPTION: Machine configuration for the versal-generic devices
 
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -120,8 +115,3 @@ QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_generic']['versal-generic' != "${MACHINE}"]}"
-
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index a4e6e725..df82a683 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: zynq-generic
 #@DESCRIPTION: Machine configuration for the zynq-generic devices
 
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zynq-generic:']['zynq-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -96,8 +91,3 @@ QB_OPT_APPEND = " \
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynq_generic']['zynq-generic' != "${MACHINE}"]}"
-
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index bf95c117..e7b47003 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: zynqmp-generic
 #@DESCRIPTION: Machine configuration for the zynqmp-generic devices
 
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -129,8 +124,3 @@ do_write_qemuboot_conf[depends] += "u-boot-xlnx-uenv:do_deploy"
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_generic']['zynqmp-generic' != "${MACHINE}"]}"
-
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD