uboot: These recipes are machine or board specific

Issue: CR-1096936

It's possible that the user is NOT using a machine that defines a board,
so we need to either use the board(board_variant) or MACHINE outselves.

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

2 files changed, 14 insertions, 2 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index bc4eb04a..b121be5e 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
@@ -46,7 +46,17 @@ SRC_URI = " \
             file://boot.cmd.ubifs \
             file://pxeboot.pxe \
             "
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# We fall back to MACHINE_ARCH in most cases
+FALLBACK_ARCH = "${MACHINE_ARCH}"
+
+# Except on zynqmp-dr, where we need to fall back to SOC_VARIANT_ARCH, which
+# falls back to MACHINE_ARCH if necessary
+SOC_VARIANT_ARCH ??= "${MACHINE_ARCH}"
+FALLBACK_ARCH_zynqmp-dr = "${SOC_VARIANT_ARCH}"
+
+BOARDVARIANT_ARCH ??= "${FALLBACK_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 
 inherit image-artifact-names
 UENV_TEXTFILE ?= "uEnv.txt"
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
index 6e4c3c0b..9d3abe77 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
@@ -3,7 +3,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 INHIBIT_DEFAULT_DEPS = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 
 python () {
     # The device trees must be populated in the deploy directory to correctly