4 files changed, 12 insertions, 8 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
index c7bb00f2..f2342041 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
@@ -10,8 +10,9 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynq = "zynq"
 COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 
-# This is really BOARD specific, but we'll set it MACHINE for now.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Specify a default in case boardvariant isn't available
+BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_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-bsp/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
index c6b5a107..dbc0c079 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
@@ -10,8 +10,9 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_versal = "versal"
 
-# This is really BOARD specific, but we'll set it MACHINE for now.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Specify a default in case boardvariant isn't available
+BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_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-bsp/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
index b23ece4a..1400e3b3 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
@@ -9,8 +9,9 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 
-# This is really BOARD specific, but we'll set it MACHINE for now.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Specify a default in case boardvariant isn't available
+BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_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-bsp/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
index b5c54879..ea41f8ff 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
@@ -10,8 +10,9 @@ INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE_versal = "versal"
 
-# This is really BOARD specific, but we'll set it MACHINE for now.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+# Specify a default in case boardvariant isn't available
+BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 
 # Default would be a multiconfig (versal) build
 # For this to work, BBMULTICONFIG += "versal-fw" must be in the user's local.conf!