sunxi: Share the board Kconfig across architectures

With the introduction of the Allwinner D1, the sunxi board family now
spans multiple architectures (ARM and RISC-V). Since ARCH_SUNXI depends
on ARM, it cannot be used to gate architecture-independent options.
Specifically, this means the board Kconfig file cannot be sourced from
inside the "if ARCH_SUNXI" block.

Introduce a new BOARD_SUNXI symbol that can be selected by both
ARCH_SUNXI now and the new RISC-V SoC symbols when they are added, and
use it to gate the architecture-independent board options.

Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2022-08-04 21:30:57 -05:00
parent 00394be831
commit 1c30baf6d6
4 changed files with 13 additions and 2 deletions

View File

@ -458,6 +458,7 @@ source "arch/Kconfig.nxp"
endif
source "board/keymile/Kconfig"
source "board/sunxi/Kconfig"
if MIPS || MICROBLAZE

View File

@ -1134,6 +1134,7 @@ config ARCH_SOCFPGA
config ARCH_SUNXI
bool "Support sunxi (Allwinner) SoCs"
select BINMAN
select BOARD_SUNXI
select CMD_GPIO if GPIO
select CMD_MMC if MMC
select CMD_USB if DISTRO_DEFAULTS && USB_HOST

View File

@ -1046,8 +1046,6 @@ config BLUETOOTH_DT_DEVICE_FIXUP
The used address is "bdaddr" if set, and "ethaddr" with the LSB
flipped elsewise.
source "board/sunxi/Kconfig"
endif
config CHIP_DIP_SCAN

View File

@ -1,3 +1,10 @@
config BOARD_SUNXI
bool
if BOARD_SUNXI
menu "sunxi board options"
choice
prompt "SPL Image Type"
depends on SPL
@ -23,3 +30,7 @@ config SPL_IMAGE_TYPE
string
default "sunxi_egon" if SPL_IMAGE_TYPE_SUNXI_EGON
default "sunxi_toc0" if SPL_IMAGE_TYPE_SUNXI_TOC0
endmenu
endif