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: Masahiro Yamada <yamada.m@jp.panasonic.com>

44 files changed, 0 insertions, 67 deletions

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 51d5aff08e..d3ef58be04 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -2,7 +2,6 @@ menu "ARC architecture"
 	depends on ARC
 
 config SYS_ARCH
-	string
 	default "arc"
 
 choice
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 11143a8c38..c8537bbe88 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2,7 +2,6 @@ menu "ARM architecture"
 	depends on ARM
 
 config SYS_ARCH
-	string
 	default "arm"
 
 choice
diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig
index be1b0f9126..4c18ab631e 100644
--- a/arch/arm/cpu/arm926ejs/davinci/Kconfig
+++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
index 58867f3cf1..91ffedf732 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
+++ b/arch/arm/cpu/arm926ejs/kirkwood/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"
diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/cpu/arm926ejs/nomadik/Kconfig
index 7177800a61..eda51fdc37 100644
--- a/arch/arm/cpu/arm926ejs/nomadik/Kconfig
+++ b/arch/arm/cpu/arm926ejs/nomadik/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"
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
index aa40099037..2d0ab2be17 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/Kconfig
+++ b/arch/arm/cpu/arm926ejs/orion5x/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"
diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/cpu/arm926ejs/versatile/Kconfig
index fc29c9800f..35c16d876c 100644
--- a/arch/arm/cpu/arm926ejs/versatile/Kconfig
+++ b/arch/arm/cpu/arm926ejs/versatile/Kconfig
@@ -1,23 +1,18 @@
 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
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index b6a558b235..d132f03514 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig
index 9527928f6a..29ff99511c 100644
--- a/arch/arm/cpu/armv7/highbank/Kconfig
+++ b/arch/arm/cpu/armv7/highbank/Kconfig
@@ -1,19 +1,15 @@
 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
diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/cpu/armv7/keystone/Kconfig
index 24d0cbe820..8249b5e270 100644
--- a/arch/arm/cpu/armv7/keystone/Kconfig
+++ b/arch/arm/cpu/armv7/keystone/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
index 6578f0cf5a..6fae1e5f36 100644
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/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"
diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
index 20d2c1141a..e270895135 100644
--- a/arch/arm/cpu/armv7/omap4/Kconfig
+++ b/arch/arm/cpu/armv7/omap4/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"
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
index be803939bc..2ccf5b919d 100644
--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/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"
diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
index 55c620a7c4..6c2bb22a85 100644
--- a/arch/arm/cpu/armv7/rmobile/Kconfig
+++ b/arch/arm/cpu/armv7/rmobile/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"
diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
index 8e2153bb83..bcae2d6033 100644
--- a/arch/arm/cpu/armv7/tegra-common/Kconfig
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -18,7 +18,6 @@ config TEGRA124
 endchoice
 
 config SYS_CPU
-	string
 	default "arm720t" if SPL_BUILD
 	default "armv7" if !SPL_BUILD
 
diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/cpu/armv7/tegra114/Kconfig
index 33a22da535..31012bc770 100644
--- a/arch/arm/cpu/armv7/tegra114/Kconfig
+++ b/arch/arm/cpu/armv7/tegra114/Kconfig
@@ -9,7 +9,6 @@ config TARGET_DALMORE
 endchoice
 
 config SYS_SOC
-	string
 	default "tegra114"
 
 source "board/nvidia/dalmore/Kconfig"
diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/cpu/armv7/tegra124/Kconfig
index 753f511eda..6a1c83a27b 100644
--- a/arch/arm/cpu/armv7/tegra124/Kconfig
+++ b/arch/arm/cpu/armv7/tegra124/Kconfig
@@ -12,7 +12,6 @@ config TARGET_VENICE2
 endchoice
 
 config SYS_SOC
-	string
 	default "tegra124"
 
 source "board/nvidia/jetson-tk1/Kconfig"
diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/cpu/armv7/tegra20/Kconfig
index e2e08900b9..a354e2ad1f 100644
--- a/arch/arm/cpu/armv7/tegra20/Kconfig
+++ b/arch/arm/cpu/armv7/tegra20/Kconfig
@@ -36,7 +36,6 @@ config TARGET_COLIBRI_T20_IRIS
 endchoice
 
 config SYS_SOC
-	string
 	default "tegra20"
 
 source "board/nvidia/harmony/Kconfig"
diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/cpu/armv7/tegra30/Kconfig
index 694e1cd974..54aec4ed50 100644
--- a/arch/arm/cpu/armv7/tegra30/Kconfig
+++ b/arch/arm/cpu/armv7/tegra30/Kconfig
@@ -18,7 +18,6 @@ config TARGET_TEC_NG
 endchoice
 
 config SYS_SOC
-	string
 	default "tegra30"
 
 source "board/nvidia/beaver/Kconfig"
diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig
index 6b88f1841b..d6655a972b 100644
--- a/arch/arm/cpu/armv7/zynq/Kconfig
+++ b/arch/arm/cpu/armv7/zynq/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
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 46337aea55..66de2ad7ef 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -2,7 +2,6 @@ menu "AVR32 architecture"
 	depends on AVR32
 
 config SYS_ARCH
-	string
 	default "avr32"
 
 choice
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index bb8a133059..31913fe29f 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -2,7 +2,6 @@ menu "Blackfin architecture"
 	depends on BLACKFIN
 
 config SYS_ARCH
-	string
 	default "blackfin"
 
 choice
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6cda7db699..5374b4d6eb 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -2,7 +2,6 @@ menu "M68000 architecture"
 	depends on M68K
 
 config SYS_ARCH
-	string
 	default "m68k"
 
 choice
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index ddaa45fb66..33bfd9f2f4 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -2,7 +2,6 @@ menu "MicroBlaze architecture"
 	depends on MICROBLAZE
 
 config SYS_ARCH
-	string
 	default "microblaze"
 
 choice
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5bf0df4ff1..7686b779bf 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2,7 +2,6 @@ menu "MIPS architecture"
 	depends on MIPS
 
 config SYS_ARCH
-	string
 	default "mips"
 
 choice
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index 743a8fe736..81b0a0158f 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -2,7 +2,6 @@ menu "NDS32 architecture"
 	depends on NDS32
 
 config SYS_ARCH
-	string
 	default "nds32"
 
 choice
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 0cba45bdbe..b3be7b56c3 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -2,7 +2,6 @@ menu "Nios II architecture"
 	depends on NIOS2
 
 config SYS_ARCH
-	string
 	default "nios2"
 
 choice
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index cc54a2eec1..4d62b4c977 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -2,7 +2,6 @@ menu "OpenRISC architecture"
 	depends on OPENRISC
 
 config SYS_ARCH
-	string
 	default "openrisc"
 
 choice
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3325af3e5c..6f96c7cc52 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -2,7 +2,6 @@ menu "PowerPC architecture"
 	depends on PPC
 
 config SYS_ARCH
-	string
 	default "powerpc"
 
 choice
diff --git a/arch/powerpc/cpu/74xx_7xx/Kconfig b/arch/powerpc/cpu/74xx_7xx/Kconfig
index 6ce464da76..3378c91645 100644
--- a/arch/powerpc/cpu/74xx_7xx/Kconfig
+++ b/arch/powerpc/cpu/74xx_7xx/Kconfig
@@ -2,7 +2,6 @@ menu "74xx_7xx CPU"
 	depends on 74xx_7xx
 
 config SYS_CPU
-	string
 	default "74xx_7xx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc512x/Kconfig b/arch/powerpc/cpu/mpc512x/Kconfig
index bfc4eae980..a0f0ede6f3 100644
--- a/arch/powerpc/cpu/mpc512x/Kconfig
+++ b/arch/powerpc/cpu/mpc512x/Kconfig
@@ -2,7 +2,6 @@ menu "mpc512x CPU"
 	depends on MPC512X
 
 config SYS_CPU
-	string
 	default "mpc512x"
 
 choice
diff --git a/arch/powerpc/cpu/mpc5xx/Kconfig b/arch/powerpc/cpu/mpc5xx/Kconfig
index 79579d7683..aad4a7cdd8 100644
--- a/arch/powerpc/cpu/mpc5xx/Kconfig
+++ b/arch/powerpc/cpu/mpc5xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc5xx CPU"
 	depends on 5xx
 
 config SYS_CPU
-	string
 	default "mpc5xx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig
index b2f0bad544..cca58e5bbb 100644
--- a/arch/powerpc/cpu/mpc5xxx/Kconfig
+++ b/arch/powerpc/cpu/mpc5xxx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc5xxx CPU"
 	depends on MPC5xxx
 
 config SYS_CPU
-	string
 	default "mpc5xxx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc824x/Kconfig b/arch/powerpc/cpu/mpc824x/Kconfig
index 309833f8c8..4f984230a4 100644
--- a/arch/powerpc/cpu/mpc824x/Kconfig
+++ b/arch/powerpc/cpu/mpc824x/Kconfig
@@ -2,7 +2,6 @@ menu "mpc824x CPU"
 	depends on MPC824X
 
 config SYS_CPU
-	string
 	default "mpc824x"
 
 choice
diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig
index 1a8707de3b..41e4e5f1ec 100644
--- a/arch/powerpc/cpu/mpc8260/Kconfig
+++ b/arch/powerpc/cpu/mpc8260/Kconfig
@@ -2,7 +2,6 @@ menu "mpc8260 CPU"
 	depends on MPC8260
 
 config SYS_CPU
-	string
 	default "mpc8260"
 
 choice
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 5fd33934b3..6de9265088 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc83xx CPU"
 	depends on MPC83xx
 
 config SYS_CPU
-	string
 	default "mpc83xx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0f703804da..8c1c01c342 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc85xx CPU"
 	depends on MPC85xx
 
 config SYS_CPU
-	string
 	default "mpc85xx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index f0ff4419d1..14e8b1aa66 100644
--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc86xx CPU"
 	depends on MPC86xx
 
 config SYS_CPU
-	string
 	default "mpc86xx"
 
 choice
diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
index 2c39244fa7..f1dca90eba 100644
--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
@@ -2,7 +2,6 @@ menu "mpc8xx CPU"
 	depends on 8xx
 
 config SYS_CPU
-	string
 	default "mpc8xx"
 
 choice
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index 2d15dd1210..41b525c16d 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -2,7 +2,6 @@ menu "ppc4xx CPU"
 	depends on 4xx
 
 config SYS_CPU
-	string
 	default "ppc4xx"
 
 choice
diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index c393550694..3057325b47 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -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
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index e6ded16b20..4bf9afc384 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -2,7 +2,6 @@ menu "SuperH architecture"
 	depends on SH
 
 config SYS_ARCH
-	string
 	default "sh"
 
 choice
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index fc9291037c..733334f931 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -2,7 +2,6 @@ menu "SPARC architecture"
 	depends on SPARC
 
 config SYS_ARCH
-	string
 	default "sparc"
 
 choice
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8fc619a3c0..ff9935acc4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2,7 +2,6 @@ menu "x86 architecture"
 	depends on X86
 
 config SYS_ARCH
-	string
 	default "x86"
 
 choice