aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-xilinx-bsp/conf/machine/include/xilinx-board.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index 700a2f80..9613a154 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -2,11 +2,11 @@ BOARD ??= ""
BOARD_VARIANT ??= ""
MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
-MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
+MACHINEOVERRIDES =. "${@['', '${BOARD}-${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
BOARD_ARCH ?= "${BOARD}"
-BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD}'][d.getVar('BOARD_VARIANT')=='']}"
PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"