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"
depends on ARC
config SYS_ARCH
string
default "arc"
choice
......
......@@ -2,7 +2,6 @@ menu "ARM architecture"
depends on ARM
config SYS_ARCH
string
default "arm"
choice
......
......@@ -54,11 +54,9 @@ config TARGET_CALIMAIN
endchoice
config SYS_CPU
string
default "arm926ejs"
config SYS_SOC
string
default "davinci"
source "board/enbw/enbw_cmc/Kconfig"
......
......@@ -60,11 +60,9 @@ config TARGET_GOFLEXHOME
endchoice
config SYS_CPU
string
default "arm926ejs"
config SYS_SOC
string
default "kirkwood"
source "board/Marvell/openrd/Kconfig"
......
......@@ -9,11 +9,9 @@ config NOMADIK_NHK8815
endchoice
config SYS_CPU
string
default "arm926ejs"
config SYS_SOC
string
default "nomadik"
source "board/st/nhk8815/Kconfig"
......
......@@ -9,11 +9,9 @@ config TARGET_EDMINIV2
endchoice
config SYS_CPU
string
default "arm926ejs"
config SYS_SOC
string
default "orion5x"
source "board/LaCie/edminiv2/Kconfig"
......
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
......@@ -39,11 +39,9 @@ config TARGET_PEACH_PIT
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "exynos"
source "board/samsung/smdkv310/Kconfig"
......
if ARCH_HIGHBANK
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "highbank"
config SYS_SOC
string
default "highbank"
config SYS_CONFIG_NAME
string
default "highbank"
endif
......@@ -12,11 +12,9 @@ config TARGET_K2E_EVM
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "keystone"
source "board/ti/ks2_evm/Kconfig"
......
......@@ -75,11 +75,9 @@ config TARGET_TWISTER
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "omap3"
source "board/logicpd/am3517evm/Kconfig"
......
......@@ -15,11 +15,9 @@ config TARGET_OMAP4_SDP4430
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "omap4"
source "board/gumstix/duovero/Kconfig"
......
......@@ -15,11 +15,9 @@ config TARGET_DRA7XX_EVM
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "omap5"
source "board/compulab/cm_t54/Kconfig"
......
......@@ -21,11 +21,9 @@ config TARGET_ALT
endchoice
config SYS_CPU
string
default "armv7"
config SYS_SOC
string
default "rmobile"
source "board/atmark-techno/armadillo-800eva/Kconfig"
......
......@@ -18,7 +18,6 @@ config TEGRA124
endchoice
config SYS_CPU
string
default "arm720t" if SPL_BUILD
default "armv7" if !SPL_BUILD
......
......@@ -9,7 +9,6 @@ config TARGET_DALMORE
endchoice
config SYS_SOC
string
default "tegra114"
source "board/nvidia/dalmore/Kconfig"
......
......@@ -12,7 +12,6 @@ config TARGET_VENICE2
endchoice
config SYS_SOC
string
default "tegra124"
source "board/nvidia/jetson-tk1/Kconfig"
......
......@@ -36,7 +36,6 @@ config TARGET_COLIBRI_T20_IRIS
endchoice
config SYS_SOC
string
default "tegra20"
source "board/nvidia/harmony/Kconfig"
......
......@@ -18,7 +18,6 @@ config TARGET_TEC_NG
endchoice
config SYS_SOC
string
default "tegra30"
source "board/nvidia/beaver/Kconfig"
......
......@@ -18,23 +18,18 @@ config TARGET_ZYNQ_ZC770
endchoice
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_zed" if TARGET_ZYNQ_ZED
default "zynq_microzed" if TARGET_ZYNQ_MICROZED
default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
......
......@@ -2,7 +2,6 @@ menu "AVR32 architecture"
depends on AVR32
config SYS_ARCH
string
default "avr32"
choice
......
......@@ -2,7 +2,6 @@ menu "Blackfin architecture"
depends on BLACKFIN
config SYS_ARCH
string
default "blackfin"
choice
......
......@@ -2,7 +2,6 @@ menu "M68000 architecture"
depends on M68K
config SYS_ARCH
string
default "m68k"
choice
......
......@@ -2,7 +2,6 @@ menu "MicroBlaze architecture"
depends on MICROBLAZE
config SYS_ARCH
string
default "microblaze"
choice
......
......@@ -2,7 +2,6 @@ menu "MIPS architecture"
depends on MIPS
config SYS_ARCH
string
default "mips"
choice
......
......@@ -2,7 +2,6 @@ menu "NDS32 architecture"
depends on NDS32
config SYS_ARCH
string
default "nds32"
choice
......
......@@ -2,7 +2,6 @@ menu "Nios II architecture"
depends on NIOS2
config SYS_ARCH
string
default "nios2"
choice
......
......@@ -2,7 +2,6 @@ menu "OpenRISC architecture"
depends on OPENRISC
config SYS_ARCH
string
default "openrisc"
choice
......
......@@ -2,7 +2,6 @@ menu "PowerPC architecture"
depends on PPC
config SYS_ARCH
string
default "powerpc"
choice
......
......@@ -2,7 +2,6 @@ menu "74xx_7xx CPU"
depends on 74xx_7xx
config SYS_CPU
string
default "74xx_7xx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc512x CPU"
depends on MPC512X
config SYS_CPU
string
default "mpc512x"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc5xx CPU"
depends on 5xx
config SYS_CPU
string
default "mpc5xx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc5xxx CPU"
depends on MPC5xxx
config SYS_CPU
string
default "mpc5xxx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc824x CPU"
depends on MPC824X
config SYS_CPU
string
default "mpc824x"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc8260 CPU"
depends on MPC8260
config SYS_CPU
string
default "mpc8260"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc83xx CPU"
depends on MPC83xx
config SYS_CPU
string
default "mpc83xx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc85xx CPU"
depends on MPC85xx
config SYS_CPU
string
default "mpc85xx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc86xx CPU"
depends on MPC86xx
config SYS_CPU
string
default "mpc86xx"
choice
......
......@@ -2,7 +2,6 @@ menu "mpc8xx CPU"
depends on 8xx
config SYS_CPU
string
default "mpc8xx"
choice
......
......@@ -2,7 +2,6 @@ menu "ppc4xx CPU"
depends on 4xx
config SYS_CPU
string
default "ppc4xx"
choice
......
......@@ -2,15 +2,12 @@ menu "Sandbox architecture"
depends on SANDBOX
config SYS_ARCH
string
default "sandbox"
config SYS_BOARD
string
default "sandbox"
config SYS_CONFIG_NAME
string
default "sandbox"
endmenu
......@@ -2,7 +2,6 @@ menu "SuperH architecture"
depends on SH
config SYS_ARCH
string
default "sh"
choice
......
......@@ -2,7 +2,6 @@ menu "SPARC architecture"
depends on SPARC
config SYS_ARCH
string
default "sparc"
choice
......
......@@ -2,7 +2,6 @@ menu "x86 architecture"
depends on X86
config SYS_ARCH
string
default "x86"
choice
......
if TARGET_ECO5PK
config SYS_BOARD
string
default "eco5pk"
config SYS_VENDOR
string
default "8dtech"
config SYS_CONFIG_NAME
string
default "eco5pk"
endif
if TARGET_ADP_AG101
config SYS_CPU
string
default "n1213"
config SYS_BOARD
string
default "adp-ag101"
config SYS_VENDOR