aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2021-01-29 10:36:55 -0800
committerMark Hatle <mark.hatle@xilinx.com>2021-02-17 14:59:42 -0800
commitfcae4549e05e1fc33e42df08a7a248fc5019e2e3 (patch)
tree8c754d38e7247f9839b963eea7ca35cc819c481c
parent565ba1305f37380214d371b04f0144c6671d9821 (diff)
downloadmeta-xilinx-fcae4549e05e1fc33e42df08a7a248fc5019e2e3.tar.gz
meta-xilinx-fcae4549e05e1fc33e42df08a7a248fc5019e2e3.tar.bz2
meta-xilinx-fcae4549e05e1fc33e42df08a7a248fc5019e2e3.zip
xilinx-board.inc: inserting a '-' in between board and boardvariant
Inserting a '-' in between board and boardvariant to align with the format of soc and soc family Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-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')]}"