treewide: drop redundant "type string" for SYS_SOC and friends

The Kconfig symbols SYS_ARCH, SYS_CPU, SYS_SOC, SYS_VENDOR and
SYS_BOARD are defined in arch/Kconfig as having type string, and most
board files simply amend those definition with suitable

  default "foo"

or

  default "foo" if BAR

stanzas. But some also include a redundant repetition of the type.

Homogenize the code base by removing those lines.

Generated by

  find arch/*/ board -name Kconfig | xargs perl -i -g -pe 's/(config SYS_(ARCH|CPU|SOC|VENDOR|BOARD)\n)\s*string\n/\1/gs'

with the trailing slash in arch/*/ ensuring that arch/Kconfig itself
is not found.

This does not change boards which add a prompt string, e.g.

  string "Board name"

because I think those change the semantics of the symbol into being
user-settable.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-octeontx/Kconfig b/arch/arm/mach-octeontx/Kconfig
index 542f4804760779c8984ea2b94a22353d013372fb..c2bef89b905dfa10fa4e49b01582746d321a62f5 100644 (file)
--- a/arch/arm/mach-octeontx/Kconfig
+++ b/arch/arm/mach-octeontx/Kconfig
@@ -13,7 +13,6 @@ config TARGET_OCTEONTX_83XX
 endchoice
 
 config SYS_SOC
-       string
        default "octeontx"
 
 endif

diff --git a/arch/arm/mach-octeontx2/Kconfig b/arch/arm/mach-octeontx2/Kconfig
index f6158df9086588350dc544cadb1ddfa07d7ed12f..c6a477be7c0d35adac890248e9ce826c0bc6d59f 100644 (file)
--- a/arch/arm/mach-octeontx2/Kconfig
+++ b/arch/arm/mach-octeontx2/Kconfig
@@ -13,7 +13,6 @@ config TARGET_OCTEONTX2_96XX
 endchoice
 
 config SYS_SOC
-       string
        default "octeontx2"
 
 endif

diff --git a/arch/mips/mach-octeon/Kconfig b/arch/mips/mach-octeon/Kconfig
index 624039df2536f2e7ebf8aff9748637d03d3857ee..5d2186bba551dda51182f97e9000b4169a811817 100644 (file)
--- a/arch/mips/mach-octeon/Kconfig
+++ b/arch/mips/mach-octeon/Kconfig
@@ -2,7 +2,6 @@ menu "Octeon platforms"
        depends on ARCH_OCTEON
 
 config SYS_SOC
-       string
        default "octeon"
 
 config OCTEON_CN7XXX

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 70eebb4bd22fbc9901a0659b1c910577e217f372..3876c3f7f986841c0c8c096cb08e105a5c17bc21 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -2,7 +2,6 @@ menu "Xtensa architecture"
        depends on XTENSA
 
 config SYS_ARCH
-       string
        default "xtensa"
 
 config SYS_CPU

diff --git a/board/Marvell/octeon_ebb7304/Kconfig b/board/Marvell/octeon_ebb7304/Kconfig
index b3244f751b1f11f743d3bf3db5aa3e26706d74be..c8dd0268f366756c48fc902bfa047ee36c5f945f 100644 (file)
--- a/board/Marvell/octeon_ebb7304/Kconfig
+++ b/board/Marvell/octeon_ebb7304/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_OCTEON_EBB7304
 
 config SYS_BOARD
-       string
        default "octeon_ebb7304"
 
 config SYS_VENDOR
-       string
        default "Marvell"
 
 config SYS_CONFIG_NAME

diff --git a/board/Marvell/octeon_nic23/Kconfig b/board/Marvell/octeon_nic23/Kconfig
index 468bbb756e61cccc36db3ab90ab406b561c00b09..ad8d508335444e43dc0dfbb062572f1105930dea 100644 (file)
--- a/board/Marvell/octeon_nic23/Kconfig
+++ b/board/Marvell/octeon_nic23/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_OCTEON_NIC23
 
 config SYS_BOARD
-       string
        default "octeon_nic23"
 
 config SYS_VENDOR
-       string
        default "Marvell"
 
 config SYS_CONFIG_NAME

diff --git a/board/Marvell/octeontx/Kconfig b/board/Marvell/octeontx/Kconfig
index 45d115916c9fb0ccc3149f03fb2a0f6f6ff87d4d..bdedd24b7a8d6987361ada427ecec2d5e02d8859 100644 (file)
--- a/board/Marvell/octeontx/Kconfig
+++ b/board/Marvell/octeontx/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_OCTEONTX_81XX || TARGET_OCTEONTX_83XX
 
 config SYS_VENDOR
-       string
        default "Marvell"
 
 config SYS_BOARD
-       string
        default "octeontx"
 
 config SYS_CONFIG_NAME

diff --git a/board/Marvell/octeontx2/Kconfig b/board/Marvell/octeontx2/Kconfig
index 99291d795b50a89ba6e4cf65f3b604f3e167dc06..8664b3e3e505b5fcd7f6c9b71379d30a267f04a4 100644 (file)
--- a/board/Marvell/octeontx2/Kconfig
+++ b/board/Marvell/octeontx2/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_OCTEONTX2_95XX || TARGET_OCTEONTX2_96XX
 
 config SYS_VENDOR
-       string
        default "Marvell"
 
 config SYS_BOARD
-       string
        default "octeontx2"
 
 config SYS_CONFIG_NAME

diff --git a/board/cadence/xtfpga/Kconfig b/board/cadence/xtfpga/Kconfig
index a64961e6d6a3f91eb28afc5b700d6f7c9c86f5cd..9d3a7aa67ac74314a19c724630627225b9765e61 100644 (file)
--- a/board/cadence/xtfpga/Kconfig
+++ b/board/cadence/xtfpga/Kconfig
@@ -17,11 +17,9 @@ config XTFPGA_KC705
 endchoice
 
 config SYS_BOARD
-       string
        default "xtfpga"
 
 config SYS_VENDOR
-       string
        default "cadence"
 
 config SYS_CONFIG_NAME

diff --git a/board/cavium/thunderx/Kconfig b/board/cavium/thunderx/Kconfig
index 3d4b260ea29cc1d46bd72c0b269a2b9e63910f44..1add150b45dcb788b291a36fceff0ddcbb35ea89 100644 (file)
--- a/board/cavium/thunderx/Kconfig
+++ b/board/cavium/thunderx/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_THUNDERX_88XX
 
 config SYS_CPU
-       string
        default "armv8"
 
 config SYS_BOARD
-       string
        default "thunderx"
 
 config SYS_VENDOR
-       string
        default "cavium"
 
 config SYS_CONFIG_NAME

diff --git a/board/freescale/imxrt1020-evk/Kconfig b/board/freescale/imxrt1020-evk/Kconfig
index 3cb8fb1e6e9fbeefb93bc0285879034b5d7f75e7..6618a9b3b574e55637328b3b6caa6a7e0aca4237 100644 (file)
--- a/board/freescale/imxrt1020-evk/Kconfig
+++ b/board/freescale/imxrt1020-evk/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_IMXRT1020_EVK
 
 config SYS_BOARD
-       string
        default "imxrt1020-evk"
 
 config SYS_VENDOR
-       string
        default "freescale"
 
 config SYS_SOC
-       string
        default "imxrt1020"
 
 config SYS_CONFIG_NAME

diff --git a/board/freescale/imxrt1050-evk/Kconfig b/board/freescale/imxrt1050-evk/Kconfig
index 068130beca98d88752e795ab55895c4e249ee1af..04ade6ec90029725e91279b846fd7a03741874a2 100644 (file)
--- a/board/freescale/imxrt1050-evk/Kconfig
+++ b/board/freescale/imxrt1050-evk/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_IMXRT1050_EVK
 
 config SYS_BOARD
-       string
        default "imxrt1050-evk"
 
 config SYS_VENDOR
-       string
        default "freescale"
 
 config SYS_SOC
-       string
        default "imxrt1050"
 
 config SYS_CONFIG_NAME

diff --git a/board/freescale/imxrt1170-evk/Kconfig b/board/freescale/imxrt1170-evk/Kconfig
index b433d6e5df0b3b1ddcbf025973ab6e62ed709501..ad7cd4aeb9cf9d20a6d97aecc5a3ce4c58fe8e42 100644 (file)
--- a/board/freescale/imxrt1170-evk/Kconfig
+++ b/board/freescale/imxrt1170-evk/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_IMXRT1170_EVK
 
 config SYS_BOARD
-       string
        default "imxrt1170-evk"
 
 config SYS_VENDOR
-       string
        default "freescale"
 
 config SYS_SOC
-       string
        default "imxrt1170"
 
 config SYS_CONFIG_NAME

diff --git a/board/kontron/sl-mx6ul/Kconfig b/board/kontron/sl-mx6ul/Kconfig
index 782e099cec22f825e2b67f24665b2765738c1fb3..7a4ffbed28931ea70ec7b8092271662092d58a1d 100644 (file)
--- a/board/kontron/sl-mx6ul/Kconfig
+++ b/board/kontron/sl-mx6ul/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_KONTRON_MX6UL
 
 config SYS_BOARD
-       string
        default "sl-mx6ul"
 
 config SYS_VENDOR
-       string
        default "kontron"
 
 config SYS_CONFIG_NAME

diff --git a/board/kontron/sl-mx8mm/Kconfig b/board/kontron/sl-mx8mm/Kconfig
index 1cfe9ee64bd870b3e51d423f5b879d6896ec6f47..1597bcf894df4edc78e4ab3c416e4acb7ce953f2 100644 (file)
--- a/board/kontron/sl-mx8mm/Kconfig
+++ b/board/kontron/sl-mx8mm/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_KONTRON_MX8MM
 
 config SYS_BOARD
-       string
        default "sl-mx8mm"
 
 config SYS_VENDOR
-       string
        default "kontron"
 
 config SYS_CONFIG_NAME

diff --git a/board/sielaff/imx6dl-sielaff/Kconfig b/board/sielaff/imx6dl-sielaff/Kconfig
index 7876ab14c07d6985a2258cc0be97ae6b65049c7a..cad15ac30b5a20e508d01fcd248187ae8fdc18fd 100644 (file)
--- a/board/sielaff/imx6dl-sielaff/Kconfig
+++ b/board/sielaff/imx6dl-sielaff/Kconfig
@@ -1,11 +1,9 @@
 if TARGET_MX6S_SIELAFF
 
 config SYS_BOARD
-       string
        default "imx6dl-sielaff"
 
 config SYS_VENDOR
-       string
        default "sielaff"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stih410-b2260/Kconfig b/board/st/stih410-b2260/Kconfig
index 441a83cbaea6ec1add3e0e7acf1edf5bcfc28261..2dd7411b8b49439178d32e347219895135231797 100644 (file)
--- a/board/st/stih410-b2260/Kconfig
+++ b/board/st/stih410-b2260/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STIH410_B2260
 
 config SYS_BOARD
-       string
        default "stih410-b2260"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stih410"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32f429-discovery/Kconfig b/board/st/stm32f429-discovery/Kconfig
index 3c93df20afac2ff9aba33128f92ddea3fab6b43e..cde6900871af8bcb351199da42313a7512ade170 100644 (file)
--- a/board/st/stm32f429-discovery/Kconfig
+++ b/board/st/stm32f429-discovery/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32F429_DISCOVERY
 
 config SYS_BOARD
-       string
        default "stm32f429-discovery"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32f4"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32f429-evaluation/Kconfig b/board/st/stm32f429-evaluation/Kconfig
index eaa40db8a74ac980f336a50856fef1507aff1350..b168bf8d5db456a2eb80328cfae8d7b2c8375b5d 100644 (file)
--- a/board/st/stm32f429-evaluation/Kconfig
+++ b/board/st/stm32f429-evaluation/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32F429_EVALUATION
 
 config SYS_BOARD
-       string
        default "stm32f429-evaluation"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32f4"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32f469-discovery/Kconfig b/board/st/stm32f469-discovery/Kconfig
index 622a8d82d81a998643a2128eb051a82b401573b5..688523b52af8d8ef90729dac9b47007a90cd498e 100644 (file)
--- a/board/st/stm32f469-discovery/Kconfig
+++ b/board/st/stm32f469-discovery/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32F469_DISCOVERY
 
 config SYS_BOARD
-       string
        default "stm32f469-discovery"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32f4"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32f746-disco/Kconfig b/board/st/stm32f746-disco/Kconfig
index 86ace17377c5d8ccc5e14cfd5a4783d105298615..382b86e5bc981aa6838c3018cd73d8a5a52a10d3 100644 (file)
--- a/board/st/stm32f746-disco/Kconfig
+++ b/board/st/stm32f746-disco/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32F746_DISCO
 
 config SYS_BOARD
-       string
        default "stm32f746-disco"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32f7"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32h743-disco/Kconfig b/board/st/stm32h743-disco/Kconfig
index bc116bcf32faaf333de011f3f5d02344aed67550..0f0f56e1a780843e3e8effe11f0731b7fc85c13f 100644 (file)
--- a/board/st/stm32h743-disco/Kconfig
+++ b/board/st/stm32h743-disco/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32H743_DISCO
 
 config SYS_BOARD
-       string
        default "stm32h743-disco"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32h7"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32h743-eval/Kconfig b/board/st/stm32h743-eval/Kconfig
index ff86de25f7de72af05363b5b646de5329e5c8554..0fffa888e7031b3263c6fdc4101c095e9b00cd18 100644 (file)
--- a/board/st/stm32h743-eval/Kconfig
+++ b/board/st/stm32h743-eval/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32H743_EVAL
 
 config SYS_BOARD
-       string
        default "stm32h743-eval"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32h7"
 
 config SYS_CONFIG_NAME

diff --git a/board/st/stm32h750-art-pi/Kconfig b/board/st/stm32h750-art-pi/Kconfig
index ab2d0f227d721675f94ab1b5598a092a0a095ea4..6bd6a13d2a10741b9588a0ef149a9587186024a9 100644 (file)
--- a/board/st/stm32h750-art-pi/Kconfig
+++ b/board/st/stm32h750-art-pi/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_STM32H750_ART_PI
 
 config SYS_BOARD
-       string
        default "stm32h750-art-pi"
 
 config SYS_VENDOR
-       string
        default "st"
 
 config SYS_SOC
-       string
        default "stm32h7"
 
 config SYS_CONFIG_NAME

diff --git a/board/sysam/amcore/Kconfig b/board/sysam/amcore/Kconfig
index e13ee8f6e90edae7ef2919137920ff901c400aac..b5c81dda237d8d42391f58a6b95c7b41ae4746f8 100644 (file)
--- a/board/sysam/amcore/Kconfig
+++ b/board/sysam/amcore/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_AMCORE
 
 config SYS_CPU
-        string
         default "mcf530x"
 
 config SYS_BOARD
-        string
         default "amcore"
 
 config SYS_VENDOR
-        string
         default "sysam"
 
 config SYS_CONFIG_NAME