Skip to content

Commit f13bc6b

Browse files
committed
boards: declare ARCH=arm64 explicitly on five inheriting boards
Five board configs were inheriting their architecture either implicitly (via BOARDFAMILY → kernel-config selection) or by sourcing another board's .csc and never overriding it. Declare ARCH explicitly so that arch-aware tooling (e.g. the build matrix filter that picks which boards a release/arch target should fan out to) can match them by a direct field read instead of having to re-evaluate the BOARDFAMILY-to-arch chain. Boards touched: aml-t95z-plus.tvb BOARDFAMILY=meson-gxl → ARCH=arm64 ayn-odin2mini.csc (sources ayn-odin2.csc) → ARCH=arm64 ayn-odin2portal.csc (sources ayn-odin2.csc) → ARCH=arm64 ayn-thor.csc (sources ayn-odin2.csc) → ARCH=arm64 gateway-dk.conf BOARDFAMILY=ls1046a → ARCH=arm64 No build behaviour change for these boards: the resolved ARCH was already arm64 via inheritance, the declaration just makes it addressable at config-load time without sourcing the kernel config chain. Also clean up a stray apostrophe in aml-t95z-plus.tvb's BOARDFAMILY comment ("s912's" → "s912s").
1 parent 3640a9d commit f13bc6b

5 files changed

Lines changed: 6 additions & 1 deletion

File tree

config/boards/aml-t95z-plus.tvb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
BOARD_NAME="T95Z Plus" # (a q201 Chinese clone with internal amlogic ethernet 1gbit, complete with a chunk of metal inside to delay thermal throttling)
33
BOARD_VENDOR="amlogic"
44
BOOT_FDT_FILE="amlogic/meson-gxm-t95z-plus.dtb" # From chewitt's patches
5-
BOARDFAMILY="meson-gxl" # s912's are actually meson-gxm, no harm done.
5+
BOARDFAMILY="meson-gxl" # s912s are actually meson-gxm, no harm done.
6+
ARCH="arm64"
67
BOARD_VENDOR="generic"
78
BOOTCONFIG="meson-gxm-t95z-plus_defconfig" # patched-in
89
BOARD_MAINTAINER=""

config/boards/ayn-odin2mini.csc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
22
source "${SRC}/config/boards/ayn-odin2.csc"
3+
declare -g ARCH="arm64"
34
declare -g BOARD_NAME="Ayn Odin2 Mini"
45
declare -g BOARD_VENDOR="ayntec"
56
declare -g BOARD_MAINTAINER="Squishy123"

config/boards/ayn-odin2portal.csc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
22
source "${SRC}/config/boards/ayn-odin2.csc"
3+
declare -g ARCH="arm64"
34
declare -g BOARD_NAME="Ayn Odin2 Portal"
45
declare -g BOARD_VENDOR="ayntec"
56
declare -g BOARD_MAINTAINER="Squishy123"

config/boards/ayn-thor.csc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Qualcomm SM8550 octa core 8GB/12GB/16GB RAM SoC eMMC USB-C WiFi/BT
22
source "${SRC}/config/boards/ayn-odin2.csc"
3+
declare -g ARCH="arm64"
34
declare -g BOARD_NAME="Ayn Thor"
45
declare -g BOARD_VENDOR="ayntec"
56
declare -g BOARD_MAINTAINER="Squishy123"

config/boards/gateway-dk.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
BOARD_NAME="Mono Gateway Development Kit"
33
BOARD_VENDOR="mono"
44
BOARDFAMILY="ls1046a"
5+
ARCH="arm64"
56
BOARD_MAINTAINER="tomazzaman"
67
BOOTCONFIG="mono_gateway_dk_defconfig"
78
KERNEL_TARGET="current"

0 commit comments

Comments
 (0)