1 files changed, 1 insertions, 3 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 08f4b4e1..355a55ed 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -7,9 +7,7 @@ COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "none"
 COMPATIBLE_MACHINE:versal = ".*"
-# Specify a default in case boardvariant isn't available
+PACKAGE_ARCH = "${MACHINE_ARCH}"
-BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 S = "${WORKDIR}/git"
 B = "${S}/lib/sw_apps/versal_plm/src"

diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc index 08f4b4e1..355a55ed 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -7,9 +7,7 @@ COMPATIBLE_HOST = "microblaze.*-elf"
7	COMPATIBLE_MACHINE = "none"	7	COMPATIBLE_MACHINE = "none"
8	COMPATIBLE_MACHINE:versal = ".*"	8	COMPATIBLE_MACHINE:versal = ".*"
9		9
10	# Specify a default in case boardvariant isn't available	10	PACKAGE_ARCH = "${MACHINE_ARCH}"
11	BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
12	PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
13		11
14	S = "${WORKDIR}/git"	12	S = "${WORKDIR}/git"
15	B = "${S}/lib/sw_apps/versal_plm/src"	13	B = "${S}/lib/sw_apps/versal_plm/src"