Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: integrator: move board select into mach-integrator/Kconfig

Browse source 
The board/SoC select menu in arch/arm/Kconfig is still cluttered.
Add ARCH_INTEGRATOR into arch/arm/Kconfig and move the board select
under arch/arm/mach-integrator.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Masahiro Yamada 2015-04-21 21:59:36 +09:00 committed by Tom Rini
parent 526fcc2203
commit 5cbbd9bd0a
12 changed files with 70 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/arm/Kconfig
View file

@ -65,18 +65,6 @@ config SEMIHOSTING
choice choice
prompt "Target select" prompt "Target select"
config TARGET_INTEGRATORAP_CM720T
bool "Support integratorap_cm720t"
select CPU_ARM720T
config TARGET_INTEGRATORAP_CM920T
bool "Support integratorap_cm920t"
select CPU_ARM920T
config TARGET_INTEGRATORCP_CM920T
bool "Support integratorcp_cm920t"
select CPU_ARM920T
config ARCH_AT91 config ARCH_AT91
bool "Atmel AT91" bool "Atmel AT91"
@ -96,14 +84,6 @@ config TARGET_SMDK2410
bool "Support smdk2410" bool "Support smdk2410"
select CPU_ARM920T select CPU_ARM920T
config TARGET_INTEGRATORAP_CM926EJS
bool "Support integratorap_cm926ejs"
select CPU_ARM926EJS
config TARGET_INTEGRATORCP_CM926EJS
bool "Support integratorcp_cm926ejs"
select CPU_ARM926EJS
config TARGET_ASPENITE config TARGET_ASPENITE
bool "Support aspenite" bool "Support aspenite"
select CPU_ARM926EJS select CPU_ARM926EJS
@ -251,10 +231,6 @@ config ARCH_VERSATILE
bool "ARM Ltd. Versatile family" bool "ARM Ltd. Versatile family"
select CPU_ARM926EJS select CPU_ARM926EJS
config TARGET_INTEGRATORCP_CM1136
bool "Support integratorcp_cm1136"
select CPU_ARM1136
config TARGET_IMX31_PHYCORE config TARGET_IMX31_PHYCORE
bool "Support imx31_phycore" bool "Support imx31_phycore"
select CPU_ARM1136 select CPU_ARM1136
@ -303,14 +279,6 @@ config ARCH_BCM283X
select DM_SERIAL select DM_SERIAL
select DM_GPIO select DM_GPIO
config TARGET_INTEGRATORAP_CM946ES
bool "Support integratorap_cm946es"
select CPU_ARM946ES
config TARGET_INTEGRATORCP_CM946ES
bool "Support integratorcp_cm946es"
select CPU_ARM946ES
config TARGET_VEXPRESS_CA15_TC2 config TARGET_VEXPRESS_CA15_TC2
bool "Support vexpress_ca15_tc2" bool "Support vexpress_ca15_tc2"
select CPU_V7 select CPU_V7
@ -465,6 +433,9 @@ config ARCH_HIGHBANK
bool "Calxeda Highbank" bool "Calxeda Highbank"
select CPU_V7 select CPU_V7
config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family"
config ARCH_KEYSTONE config ARCH_KEYSTONE
bool "TI Keystone" bool "TI Keystone"
select CPU_V7 select CPU_V7
@ -805,6 +776,8 @@ source "arch/arm/cpu/armv7/exynos/Kconfig"
source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-highbank/Kconfig"
source "arch/arm/mach-integrator/Kconfig"
source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig" source "arch/arm/mach-kirkwood/Kconfig"
@ -850,7 +823,6 @@ source "board/Marvell/db-mv784mp-gp/Kconfig"
source "board/Marvell/gplugd/Kconfig" source "board/Marvell/gplugd/Kconfig"
source "board/altera/socfpga/Kconfig" source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig" source "board/armadeus/apf27/Kconfig"
source "board/armltd/integrator/Kconfig"
source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig" source "board/armltd/vexpress64/Kconfig"
source "board/bachmann/ot1200/Kconfig" source "board/bachmann/ot1200/Kconfig"

57
arch/arm/mach-integrator/Kconfig Normal file
View file

@ -0,0 +1,57 @@
menu "Integrator Options"
depends on ARCH_INTEGRATOR
choice
prompt "ARM Ltd. Integrator board select"
config TARGET_INTEGRATORAP_CM720T
bool "Support integratorap_cm720t"
select CPU_ARM720T
config TARGET_INTEGRATORAP_CM920T
bool "Support integratorap_cm920t"
select CPU_ARM920T
config TARGET_INTEGRATORCP_CM920T
bool "Support integratorcp_cm920t"
select CPU_ARM920T
config TARGET_INTEGRATORAP_CM926EJS
bool "Support integratorap_cm926ejs"
select CPU_ARM926EJS
config TARGET_INTEGRATORCP_CM926EJS
bool "Support integratorcp_cm926ejs"
select CPU_ARM926EJS
config TARGET_INTEGRATORCP_CM1136
bool "Support integratorcp_cm1136"
select CPU_ARM1136
config TARGET_INTEGRATORAP_CM946ES
bool "Support integratorap_cm946es"
select CPU_ARM946ES
config TARGET_INTEGRATORCP_CM946ES
bool "Support integratorcp_cm946es"
select CPU_ARM946ES
endchoice
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorap" if TARGET_INTEGRATORAP_CM720T || \
TARGET_INTEGRATORAP_CM920T || \
TARGET_INTEGRATORAP_CM926EJS || \
TARGET_INTEGRATORAP_CM946ES
default "integratorcp" if TARGET_INTEGRATORCP_CM920T || \
TARGET_INTEGRATORCP_CM926EJS || \
TARGET_INTEGRATORCP_CM946ES || \
TARGET_INTEGRATORCP_CM1136
endmenu

103
board/armltd/integrator/Kconfig
View file

@ -1,103 +0,0 @@
if TARGET_INTEGRATORAP_CM720T
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorap"
endif
if TARGET_INTEGRATORAP_CM920T
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorap"
endif
if TARGET_INTEGRATORCP_CM920T
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorcp"
endif
if TARGET_INTEGRATORAP_CM926EJS
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorap"
endif
if TARGET_INTEGRATORCP_CM926EJS
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorcp"
endif
if TARGET_INTEGRATORCP_CM1136
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorcp"
endif
if TARGET_INTEGRATORAP_CM946ES
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorap"
endif
if TARGET_INTEGRATORCP_CM946ES
config SYS_BOARD
default "integrator"
config SYS_VENDOR
default "armltd"
config SYS_CONFIG_NAME
default "integratorcp"
endif

1
configs/integratorap_cm720t_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM720T" CONFIG_SYS_EXTRA_OPTIONS="CM720T"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM720T=y CONFIG_TARGET_INTEGRATORAP_CM720T=y

1
configs/integratorap_cm920t_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM920T" CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM920T=y CONFIG_TARGET_INTEGRATORAP_CM920T=y

1
configs/integratorap_cm926ejs_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S" CONFIG_SYS_EXTRA_OPTIONS="CM926EJ_S"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM926EJS=y CONFIG_TARGET_INTEGRATORAP_CM926EJS=y

1
configs/integratorap_cm946es_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM946ES" CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORAP_CM946ES=y CONFIG_TARGET_INTEGRATORAP_CM946ES=y

1
configs/integratorcp_cm1136_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM1136" CONFIG_SYS_EXTRA_OPTIONS="CM1136"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM1136=y CONFIG_TARGET_INTEGRATORCP_CM1136=y

1
configs/integratorcp_cm920t_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM920T" CONFIG_SYS_EXTRA_OPTIONS="CM920T"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM920T=y CONFIG_TARGET_INTEGRATORCP_CM920T=y

1
configs/integratorcp_cm926ejs_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S" CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM926EJS=y CONFIG_TARGET_INTEGRATORCP_CM926EJS=y

1
configs/integratorcp_cm946es_defconfig
View file

@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="CM946ES" CONFIG_SYS_EXTRA_OPTIONS="CM946ES"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_INTEGRATOR=y
CONFIG_TARGET_INTEGRATORCP_CM946ES=y CONFIG_TARGET_INTEGRATORCP_CM946ES=y

1
include/configs/integratorap.h
View file

@ -18,7 +18,6 @@
#include "integrator-common.h" #include "integrator-common.h"
/* Integrator/AP-specific configuration */ /* Integrator/AP-specific configuration */
#define CONFIG_ARCH_INTEGRATOR
#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */ #define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
/* /*