From 4ea0452525a0cd20fadece3b0c7e861543579e4c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 5 Jan 2023 14:38:13 -0800 Subject: 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 --- .../conf/machine/include/xilinx-board-post.inc | 6 ------ meta-xilinx-core/conf/machine/include/xilinx-board-pre.inc | 14 -------------- meta-xilinx-core/conf/machine/versal-generic.conf | 10 ---------- meta-xilinx-core/conf/machine/zynq-generic.conf | 10 ---------- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 10 ---------- 5 files changed, 50 deletions(-) delete mode 100644 meta-xilinx-core/conf/machine/include/xilinx-board-post.inc delete mode 100644 meta-xilinx-core/conf/machine/include/xilinx-board-pre.inc (limited to 'meta-xilinx-core/conf/machine') 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/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 -- cgit v1.2.3-54-g00ecf