Move away from PACKAGE_ARCH = "BOARD_ARCH" or "BOARDVARIANT_ARCH"

PACKAGE_ARCH should not be MACHINE_ARCH, unless a specific override is
being used for compatibility.

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

10 files changed, 11 insertions, 38 deletions

diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 9c2e0e08..b90295ff 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -28,14 +28,12 @@ inherit image-artifact-names
 
 ATF_BASE_NAME ?= "${PN}-${PKGE}-${PKGV}-${PKGR}${IMAGE_VERSION_SUFFIX}"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
-
 COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 PLATFORM:zynqmp = "zynqmp"
 PLATFORM:versal = "versal"
 
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 532da106..2595f2c4 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -16,9 +16,7 @@ DEPENDS += "bootgen-native"
 # There is no bitstream recipe, so really depend on virtual/bitstream
 DEPENDS += "${@(d.getVar('BIF_PARTITION_ATTR') or "").replace('bitstream', 'virtual/bitstream')}"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 BIF_FILE_PATH ?= "${B}/bootgen.bif"
 
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index 27f008f8..626a9cb1 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -20,10 +20,6 @@ DT_FILES_PATH = "${@os.path.dirname(d.getVar('SYSTEM_DTFILE')) if d.getVar('SYST
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-# Device-trees are inherently board specific
-BOARD_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARD_ARCH}"
-
 DEPENDS += "python3-dtc-native"
 
 PROVIDES = "virtual/dtb"
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
index 2fa71309..ae2123e7 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
@@ -10,9 +10,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynq = "zynq"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Default would be a multiconfig (versal) build
 # For this to work, BBMULTICONFIG += "fsbl-fw" must be in the user's local.conf!
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
index 70d234c9..6a2a5172 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
@@ -10,9 +10,7 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = "versal"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Default would be a multiconfig (versal) build
 # For this to work, BBMULTICONFIG += "versal-fw" must be in the user's local.conf!
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
index 7371127c..ea0eb5a6 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
@@ -9,9 +9,7 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Default would be a multiconfig (zynqmp-pmufw) build
 # For this to work, BBMULTICONFIG += "zynqmp-pmufw" must be in the user's local.conf!
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
index 5a885b3b..89a9e93f 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
@@ -10,9 +10,7 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = "versal"
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # Default would be a multiconfig (versal) build
 # For this to work, BBMULTICONFIG += "versal-fw" must be in the user's local.conf!
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 893b8f6c..c41a4bad 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -18,7 +18,3 @@ B = "${WORKDIR}/build"
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
 
 SYSROOT_DIRS += "/boot"
-
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index a75484a8..766b2b81 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb
@@ -47,14 +47,8 @@ SRC_URI = " \
             file://pxeboot.pxe \
             "
 
-# Specify a default in case boardvariant isn't available
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
-
-# On zynqmp-dr, we know we're different so if BOARD is not defined, fall back
-# to the SOC_VARIANT_ARCH instead
-SOC_VARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH:zynqmp-dr = "${@['${BOARDVARIANT_ARCH}', '${SOC_VARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH')==d.getVar('MACHINE_ARCH')]}"
+# Even thought we don't create a package, make sure this is unique to the machine
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit image-artifact-names
 UENV_TEXTFILE ?= "uEnv.txt"
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
index 52ae09f0..e35c0e30 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
@@ -4,9 +4,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
-
 python () {
     # The device trees must be populated in the deploy directory to correctly
     # detect them and their names. This means that this recipe needs to depend
@@ -25,6 +22,8 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynq = ".*"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 inherit deploy image-wic-utils
 
 def uboot_boot_cmd(d):