@@ -130,6 +130,9 @@ choice
prompt "Target select"
default TARGET_HIKEY
+config ARCH_ASPEED
+ bool "Support Apseed SoCs"
+
config ARCH_AT91
bool "Atmel AT91"
@@ -899,18 +902,10 @@ config TARGET_THUNDERX_88XX
select OF_CONTROL
select SYS_CACHE_SHIFT_7
-config TARGET_AST_G5
- bool "Support Apseed fifth generation SoCs"
- select CPU_ARM1176
- select AST_SPI_NOR
-
-config TARGET_AST_G4
- bool "Support Aspeed fourth generation SoCs"
- select CPU_ARM926EJS
- select AST_SPI_NOR
-
endchoice
+source "arch/arm/mach-aspeed/Kconfig"
+
source "arch/arm/mach-at91/Kconfig"
source "arch/arm/mach-bcm283x/Kconfig"
@@ -1050,7 +1045,6 @@ source "board/vscom/baltos/Kconfig"
source "board/woodburn/Kconfig"
source "board/work-microwave/work_92105/Kconfig"
source "board/zipitz2/Kconfig"
-source "board/aspeed/Kconfig"
source "arch/arm/Kconfig.debug"
similarity index 52%
rename from board/aspeed/Kconfig
rename to arch/arm/mach-aspeed/Kconfig
@@ -1,5 +1,21 @@
-source "board/aspeed/ast-g5/Kconfig"
-source "board/aspeed/ast-g4/Kconfig"
+if ARCH_ASPEED
+
+
+choice
+ prompt "Aspeed SoC select"
+ optional
+
+config TARGET_AST_G5
+ bool "Support Apseed fifth generation SoCs"
+ select CPU_ARM1176
+ select AST_SPI_NOR
+
+config TARGET_AST_G4
+ bool "Support Aspeed fourth generation SoCs"
+ select CPU_ARM926EJS
+ select AST_SPI_NOR
+
+endchoice
choice
prompt "Network configuration"
@@ -20,3 +36,15 @@ config AST_SPI_NOR
help
Enable Aspeed SMC driver to access the SPI NOR flash of the
BMC
+
+config SYS_VENDOR
+ default "aspeed"
+
+config SYS_SOC
+ default "aspeed"
+
+
+source "board/aspeed/ast-g5/Kconfig"
+source "board/aspeed/ast-g4/Kconfig"
+
+endif
@@ -9,12 +9,6 @@ config SYS_CPU
config SYS_BOARD
default "ast-g4"
-config SYS_VENDOR
- default "aspeed"
-
-config SYS_SOC
- default "aspeed"
-
config SYS_CONFIG_NAME
default "ast-g4-phy" if ASPEED_NET_PHY
default "ast-g4-ncsi" if ASPEED_NET_NCSI
@@ -9,12 +9,6 @@ config SYS_CPU
config SYS_BOARD
default "ast-g5"
-config SYS_VENDOR
- default "aspeed"
-
-config SYS_SOC
- default "aspeed"
-
config SYS_CONFIG_NAME
default "ast-g5-phy" if ASPEED_NET_PHY
default "ast-g5-ncsi" if ASPEED_NET_NCSI
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
CONFIG_TARGET_AST_G4=y
CONFIG_SYS_PROMPT="ast# "
CONFIG_CMD_DHCP=y
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
CONFIG_TARGET_AST_G4=y
CONFIG_ASPEED_NET_PHY=y
CONFIG_SYS_PROMPT="ast# "
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
CONFIG_TARGET_AST_G5=y
CONFIG_SYS_PROMPT="ast# "
CONFIG_CMD_DHCP=y
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
CONFIG_TARGET_AST_G5=y
CONFIG_ASPEED_NET_PHY=y
CONFIG_SYS_PROMPT="ast# "
@@ -14,7 +14,6 @@
#ifndef __AST_COMMON_CONFIG_H
#define __AST_COMMON_CONFIG_H
-#define CONFIG_ARCH_ASPEED
#define CONFIG_EXTRA_ENV_SETTINGS ASPEED_ENV_SETTINGS
#define CONFIG_ARCH_CPU_INIT
and also add a proper CONFIG_ARCH_ASPEED Signed-off-by: Cédric Le Goater <clg@kaod.org> --- arch/arm/Kconfig | 16 ++++--------- {board/aspeed => arch/arm/mach-aspeed}/Kconfig | 32 ++++++++++++++++++++++++-- board/aspeed/ast-g4/Kconfig | 6 ----- board/aspeed/ast-g5/Kconfig | 6 ----- configs/ast_g4_ncsi_defconfig | 1 + configs/ast_g4_phy_defconfig | 1 + configs/ast_g5_ncsi_defconfig | 1 + configs/ast_g5_phy_defconfig | 1 + include/configs/ast-common.h | 1 - 9 files changed, 39 insertions(+), 26 deletions(-) rename {board/aspeed => arch/arm/mach-aspeed}/Kconfig (52%)