diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-05-07 08:20:02 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-07-14 15:00:08 -0700 |
| commit | 7dba7145af05775b8ff3640822b2132325c5beac (patch) | |
| tree | db0772186d8e1fe144480a65165a53fe6017da4e /meta-xilinx-bsp/conf/machine/include | |
| parent | 2d2d75a2f84caada85c63bd056e03546007b535c (diff) | |
| download | meta-xilinx-7dba7145af05775b8ff3640822b2132325c5beac.tar.gz | |
xilinx-board: Ensure a board arch is defined in all cases
Issue: CR-1096936
Some recipes may require board specific items, such as DTB. Even in a
generic build, we need to use BOARD_ARCH so we do not have duplicate
packages generated that have different contents.
Additionally if the BOARD is not specified MACHINE could appear twice, this
can cause processing errors.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf/machine/include')
| -rw-r--r-- | meta-xilinx-bsp/conf/machine/include/xilinx-board.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc index dc659fd3..5eaeca7b 100644 --- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc +++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc | |||
| @@ -5,8 +5,8 @@ MACHINEOVERRIDES .= "${@['', ':${BOARD}']['${BOARD}' != '']}" | |||
| 5 | MACHINEOVERRIDES .= "${@['', ':${BOARD}-${BOARD_VARIANT}']['${BOARD_VARIANT}' != '']}" | 5 | MACHINEOVERRIDES .= "${@['', ':${BOARD}-${BOARD_VARIANT}']['${BOARD_VARIANT}' != '']}" |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | BOARD_ARCH ?= "${BOARD}" | 8 | BOARD_ARCH ?= "${@['${BOARD}', '${MACHINE_ARCH}'][d.getVar('BOARD')=='']}" |
| 9 | BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD}'][d.getVar('BOARD_VARIANT')=='']}" | 9 | BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD_ARCH}'][d.getVar('BOARD_VARIANT')=='']}" |
| 10 | 10 | ||
| 11 | PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}" | 11 | PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARD_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('MACHINE_ARCH')]}" |
| 12 | PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}" | 12 | PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}" |