random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

sunxi: Share the board Kconfig across architectures

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/Kconfig
View File

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

1
arch/arm/Kconfig
View File

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

2
arch/arm/mach-sunxi/Kconfig
View File

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

11
board/sunxi/Kconfig
View File

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