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 542f480..c2bef89 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 f6158df..c6a477b 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 624039d..5d2186b 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 70eebb4..3876c3f 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 b3244f7..c8dd026 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 468bbb7..ad8d508 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 45d1159..bdedd24 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 99291d7..8664b3e 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 a64961e..9d3a7aa 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 3d4b260..1add150 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 3cb8fb1..6618a9b 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 068130b..04ade6e 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 b433d6e..ad7cd4a 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 782e099..7a4ffbe 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 1cfe9ee..1597bcf 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 7876ab1..cad15ac 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 441a83c..2dd7411 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 3c93df2..cde6900 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 eaa40db..b168bf8 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 622a8d8..688523b 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 86ace17..382b86e 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 bc116bc..0f0f56e 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 ff86de2..0fffa88 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 ab2d0f2..6bd6a13 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 e13ee8f..b5c81dd 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