V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

versatile: kconfig: move common settings 

Move Versatile-specific settings to versatile/Kconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Masahiro Yamada 2014-08-31 07:10:58 +09:00 committed by Tom Rini
parent f40b989863
commit ad17a81c06
6 changed files with 30 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/Kconfig
View File

@ -308,14 +308,8 @@ config TARGET_SPEAR600
config TARGET_X600 config TARGET_X600
bool "Support x600" bool "Support x600"
config TARGET_VERSATILEAB config ARCH_VERSATILE
bool "Support versatileab" bool "ARM Ltd. Versatile family"
config TARGET_VERSATILEPB
bool "Support versatilepb"
config TARGET_VERSATILEQEMU
bool "Support versatileqemu"
config TARGET_INTEGRATORCP_CM1136 config TARGET_INTEGRATORCP_CM1136
bool "Support integratorcp_cm1136" bool "Support integratorcp_cm1136"
@ -720,6 +714,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/tegra-common/Kconfig" source "arch/arm/cpu/armv7/tegra-common/Kconfig"
source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
source "arch/arm/cpu/armv7/zynq/Kconfig" source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig" source "board/8dtech/eco5pk/Kconfig"
@ -750,7 +746,6 @@ source "board/ait/cam_enc_4xx/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/integrator/Kconfig"
source "board/armltd/versatile/Kconfig"
source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig" source "board/armltd/vexpress64/Kconfig"
source "board/atmel/at91rm9200ek/Kconfig" source "board/atmel/at91rm9200ek/Kconfig"

23
arch/arm/cpu/arm926ejs/versatile/Kconfig Normal file
View File

@ -0,0 +1,23 @@
if ARCH_VERSATILE
config SYS_CPU
string
default "arm926ejs"
config SYS_BOARD
string
default "versatile"
config SYS_VENDOR
string
default "armltd"
config SYS_SOC
string
default "versatile"
config SYS_CONFIG_NAME
string
default "versatile"
endif

71
board/armltd/versatile/Kconfig
View File

@ -1,71 +0,0 @@
if TARGET_VERSATILEAB
config SYS_CPU
string
default "arm926ejs"
config SYS_BOARD
string
default "versatile"
config SYS_VENDOR
string
default "armltd"
config SYS_SOC
string
default "versatile"
config SYS_CONFIG_NAME
string
default "versatile"
endif
if TARGET_VERSATILEPB
config SYS_CPU
string
default "arm926ejs"
config SYS_BOARD
string
default "versatile"
config SYS_VENDOR
string
default "armltd"
config SYS_SOC
string
default "versatile"
config SYS_CONFIG_NAME
string
default "versatile"
endif
if TARGET_VERSATILEQEMU
config SYS_CPU
string
default "arm926ejs"
config SYS_BOARD
string
default "versatile"
config SYS_VENDOR
string
default "armltd"
config SYS_SOC
string
default "versatile"
config SYS_CONFIG_NAME
string
default "versatile"
endif

2
configs/versatileab_defconfig
View File

@ -1,3 +1,3 @@
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB" CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_VERSATILEAB=y CONFIG_ARCH_VERSATILE=y

2
configs/versatilepb_defconfig
View File

@ -1,3 +1,3 @@
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB" CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_VERSATILEPB=y CONFIG_ARCH_VERSATILE=y

2
configs/versatileqemu_defconfig
View File

@ -1,3 +1,3 @@
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB" CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_TARGET_VERSATILEQEMU=y CONFIG_ARCH_VERSATILE=y