summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-09-14 03:01:49 +0900
committerTom Rini <trini@ti.com>2014-09-13 16:43:55 -0400
commit461be2f96e4b87e5065208c6659a47dd0ad9e9f8 (patch)
treed520fd4b524d930c2ad1503b412406e62bbc6413 /arch/arm/cpu
parent3174e4e812b77f9707b358927a5ddf24228c2ae8 (diff)
downloadblackbird-obmc-uboot-461be2f96e4b87e5065208c6659a47dd0ad9e9f8.tar.gz
blackbird-obmc-uboot-461be2f96e4b87e5065208c6659a47dd0ad9e9f8.zip
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>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/Kconfig2
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/Kconfig2
-rw-r--r--arch/arm/cpu/arm926ejs/nomadik/Kconfig2
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/Kconfig2
-rw-r--r--arch/arm/cpu/arm926ejs/versatile/Kconfig5
-rw-r--r--arch/arm/cpu/armv7/exynos/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/highbank/Kconfig4
-rw-r--r--arch/arm/cpu/armv7/keystone/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/omap3/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/omap4/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/omap5/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/rmobile/Kconfig2
-rw-r--r--arch/arm/cpu/armv7/tegra-common/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/tegra114/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/tegra124/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/tegra20/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/tegra30/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/zynq/Kconfig5
18 files changed, 0 insertions, 39 deletions
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
OpenPOWER on IntegriCloud