Commit 461be2f9 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini

kconfig: remove redundant "string" type in arch and board Kconfigs

Now the types of CONFIG_SYS_{ARCH, CPU, SOC, VENDOR, BOARD, CONFIG_NAME}
are specified in arch/Kconfig.

We can delete the ones in arch and board Kconfig files.

This commit can be easily reproduced by the following command:

find . -name Kconfig -a ! -path ./arch/Kconfig | xargs sed -i -e '
/config[[:space:]]SYS_\(ARCH\|CPU\|SOC\|\VENDOR\|BOARD\|CONFIG_NAME\)/ {
    N
    s/\n[[:space:]]*string//
}
'
Signed-off-by: 's avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
parent 3174e4e8
...@@ -2,7 +2,6 @@ menu "ARC architecture" ...@@ -2,7 +2,6 @@ menu "ARC architecture"
depends on ARC depends on ARC
config SYS_ARCH config SYS_ARCH
string
default "arc" default "arc"
choice choice
......
...@@ -2,7 +2,6 @@ menu "ARM architecture" ...@@ -2,7 +2,6 @@ menu "ARM architecture"
depends on ARM depends on ARM
config SYS_ARCH config SYS_ARCH
string
default "arm" default "arm"
choice choice
......
...@@ -54,11 +54,9 @@ config TARGET_CALIMAIN ...@@ -54,11 +54,9 @@ config TARGET_CALIMAIN
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "arm926ejs" default "arm926ejs"
config SYS_SOC config SYS_SOC
string
default "davinci" default "davinci"
source "board/enbw/enbw_cmc/Kconfig" source "board/enbw/enbw_cmc/Kconfig"
......
...@@ -60,11 +60,9 @@ config TARGET_GOFLEXHOME ...@@ -60,11 +60,9 @@ config TARGET_GOFLEXHOME
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "arm926ejs" default "arm926ejs"
config SYS_SOC config SYS_SOC
string
default "kirkwood" default "kirkwood"
source "board/Marvell/openrd/Kconfig" source "board/Marvell/openrd/Kconfig"
......
...@@ -9,11 +9,9 @@ config NOMADIK_NHK8815 ...@@ -9,11 +9,9 @@ config NOMADIK_NHK8815
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "arm926ejs" default "arm926ejs"
config SYS_SOC config SYS_SOC
string
default "nomadik" default "nomadik"
source "board/st/nhk8815/Kconfig" source "board/st/nhk8815/Kconfig"
......
...@@ -9,11 +9,9 @@ config TARGET_EDMINIV2 ...@@ -9,11 +9,9 @@ config TARGET_EDMINIV2
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "arm926ejs" default "arm926ejs"
config SYS_SOC config SYS_SOC
string
default "orion5x" default "orion5x"
source "board/LaCie/edminiv2/Kconfig" source "board/LaCie/edminiv2/Kconfig"
......
if ARCH_VERSATILE if ARCH_VERSATILE
config SYS_CPU config SYS_CPU
string
default "arm926ejs" default "arm926ejs"
config SYS_BOARD config SYS_BOARD
string
default "versatile" default "versatile"
config SYS_VENDOR config SYS_VENDOR
string
default "armltd" default "armltd"
config SYS_SOC config SYS_SOC
string
default "versatile" default "versatile"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
string
default "versatile" default "versatile"
endif endif
...@@ -39,11 +39,9 @@ config TARGET_PEACH_PIT ...@@ -39,11 +39,9 @@ config TARGET_PEACH_PIT
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "exynos" default "exynos"
source "board/samsung/smdkv310/Kconfig" source "board/samsung/smdkv310/Kconfig"
......
if ARCH_HIGHBANK if ARCH_HIGHBANK
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_BOARD config SYS_BOARD
string
default "highbank" default "highbank"
config SYS_SOC config SYS_SOC
string
default "highbank" default "highbank"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
string
default "highbank" default "highbank"
endif endif
...@@ -12,11 +12,9 @@ config TARGET_K2E_EVM ...@@ -12,11 +12,9 @@ config TARGET_K2E_EVM
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "keystone" default "keystone"
source "board/ti/ks2_evm/Kconfig" source "board/ti/ks2_evm/Kconfig"
......
...@@ -75,11 +75,9 @@ config TARGET_TWISTER ...@@ -75,11 +75,9 @@ config TARGET_TWISTER
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "omap3" default "omap3"
source "board/logicpd/am3517evm/Kconfig" source "board/logicpd/am3517evm/Kconfig"
......
...@@ -15,11 +15,9 @@ config TARGET_OMAP4_SDP4430 ...@@ -15,11 +15,9 @@ config TARGET_OMAP4_SDP4430
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "omap4" default "omap4"
source "board/gumstix/duovero/Kconfig" source "board/gumstix/duovero/Kconfig"
......
...@@ -15,11 +15,9 @@ config TARGET_DRA7XX_EVM ...@@ -15,11 +15,9 @@ config TARGET_DRA7XX_EVM
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "omap5" default "omap5"
source "board/compulab/cm_t54/Kconfig" source "board/compulab/cm_t54/Kconfig"
......
...@@ -21,11 +21,9 @@ config TARGET_ALT ...@@ -21,11 +21,9 @@ config TARGET_ALT
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_SOC config SYS_SOC
string
default "rmobile" default "rmobile"
source "board/atmark-techno/armadillo-800eva/Kconfig" source "board/atmark-techno/armadillo-800eva/Kconfig"
......
...@@ -18,7 +18,6 @@ config TEGRA124 ...@@ -18,7 +18,6 @@ config TEGRA124
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "arm720t" if SPL_BUILD default "arm720t" if SPL_BUILD
default "armv7" if !SPL_BUILD default "armv7" if !SPL_BUILD
......
...@@ -9,7 +9,6 @@ config TARGET_DALMORE ...@@ -9,7 +9,6 @@ config TARGET_DALMORE
endchoice endchoice
config SYS_SOC config SYS_SOC
string
default "tegra114" default "tegra114"
source "board/nvidia/dalmore/Kconfig" source "board/nvidia/dalmore/Kconfig"
......
...@@ -12,7 +12,6 @@ config TARGET_VENICE2 ...@@ -12,7 +12,6 @@ config TARGET_VENICE2
endchoice endchoice
config SYS_SOC config SYS_SOC
string
default "tegra124" default "tegra124"
source "board/nvidia/jetson-tk1/Kconfig" source "board/nvidia/jetson-tk1/Kconfig"
......
...@@ -36,7 +36,6 @@ config TARGET_COLIBRI_T20_IRIS ...@@ -36,7 +36,6 @@ config TARGET_COLIBRI_T20_IRIS
endchoice endchoice
config SYS_SOC config SYS_SOC
string
default "tegra20" default "tegra20"
source "board/nvidia/harmony/Kconfig" source "board/nvidia/harmony/Kconfig"
......
...@@ -18,7 +18,6 @@ config TARGET_TEC_NG ...@@ -18,7 +18,6 @@ config TARGET_TEC_NG
endchoice endchoice
config SYS_SOC config SYS_SOC
string
default "tegra30" default "tegra30"
source "board/nvidia/beaver/Kconfig" source "board/nvidia/beaver/Kconfig"
......
...@@ -18,23 +18,18 @@ config TARGET_ZYNQ_ZC770 ...@@ -18,23 +18,18 @@ config TARGET_ZYNQ_ZC770
endchoice endchoice
config SYS_CPU config SYS_CPU
string
default "armv7" default "armv7"
config SYS_BOARD config SYS_BOARD
string
default "zynq" default "zynq"
config SYS_VENDOR config SYS_VENDOR
string
default "xilinx" default "xilinx"
config SYS_SOC config SYS_SOC
string
default "zynq" default "zynq"
config SYS_CONFIG_NAME config SYS_CONFIG_NAME
string
default "zynq_zed" if TARGET_ZYNQ_ZED default "zynq_zed" if TARGET_ZYNQ_ZED
default "zynq_microzed" if TARGET_ZYNQ_MICROZED default "zynq_microzed" if TARGET_ZYNQ_MICROZED
default "zynq_zc70x" if TARGET_ZYNQ_ZC70X default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
......
...@@ -2,7 +2,6 @@ menu "AVR32 architecture" ...@@ -2,7 +2,6 @@ menu "AVR32 architecture"
depends on AVR32 depends on AVR32
config SYS_ARCH config SYS_ARCH
string
default "avr32" default "avr32"
choice choice
......
...@@ -2,7 +2,6 @@ menu "Blackfin architecture" ...@@ -2,7 +2,6 @@ menu "Blackfin architecture"
depends on BLACKFIN depends on BLACKFIN
config SYS_ARCH config SYS_ARCH
string
default "blackfin" default "blackfin"
choice choice
......
...@@ -2,7 +2,6 @@ menu "M68000 architecture" ...@@ -2,7 +2,6 @@ menu "M68000 architecture"
depends on M68K depends on M68K
config SYS_ARCH config SYS_ARCH
string
default "m68k" default "m68k"
choice choice
......
...@@ -2,7 +2,6 @@ menu "MicroBlaze architecture" ...@@ -2,7 +2,6 @@ menu "MicroBlaze architecture"
depends on MICROBLAZE depends on MICROBLAZE
config SYS_ARCH config SYS_ARCH
string
default "microblaze" default "microblaze"
choice choice
......
...@@ -2,7 +2,6 @@ menu "MIPS architecture" ...@@ -2,7 +2,6 @@ menu "MIPS architecture"
depends on MIPS depends on MIPS
config SYS_ARCH config SYS_ARCH
string
default "mips" default "mips"
choice choice
......
...@@ -2,7 +2,6 @@ menu "NDS32 architecture" ...@@ -2,7 +2,6 @@ menu "NDS32 architecture"
depends on NDS32 depends on NDS32
config SYS_ARCH config SYS_ARCH
string
default "nds32" default "nds32"
choice choice
......
...@@ -2,7 +2,6 @@ menu "Nios II architecture" ...@@ -2,7 +2,6 @@ menu "Nios II architecture"
depends on NIOS2 depends on NIOS2
config SYS_ARCH config SYS_ARCH
string
default "nios2" default "nios2"
choice choice
......
...@@ -2,7 +2,6 @@ menu "OpenRISC architecture" ...@@ -2,7 +2,6 @@ menu "OpenRISC architecture"