mb/*: Specify type of `VARIANT_DIR` once

Specify the type of the `VARIANT_DIR` Kconfig symbol once instead of
doing so on each and every mainboard.

Change-Id: Iea2f992a59e41e00fec3cdc9d6a13b5f3ab0a437
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56558
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

67 files changed, 3 insertions, 66 deletions

diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index dc02e98893..8f9b48cc71 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -19,6 +19,9 @@ config MAINBOARD_PART_NUMBER
 config MAINBOARD_VENDOR
 	string "Mainboard vendor name"
 
+config VARIANT_DIR
+	string
+
 config BOARD_ROMSIZE_KB_256
 	bool
 config BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index e0bf3e3c58..9d545b8701 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -53,7 +53,6 @@ config MAINBOARD_DIR
 	default "amd/mandolin"
 
 config VARIANT_DIR
-	string
 	default "mandolin" if BOARD_AMD_MANDOLIN
 	default "cereme" if BOARD_AMD_CEREME
 
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index ac58e38fbf..7ae84614a2 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -26,7 +26,6 @@ config MAINBOARD_DIR
 	default "asrock/g41c-gs"
 
 config VARIANT_DIR
-	string
 	default "g41c-gs-r2" if BOARD_ASROCK_G41C_GS_R2_0
 	default "g41c-gs" if BOARD_ASROCK_G41C_GS
 	default "g41m-gs" if BOARD_ASROCK_G41M_GS
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index 362546e999..eeec4e7882 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -18,7 +18,6 @@ config MAINBOARD_DIR
 	default "asus/h61-series"
 
 config VARIANT_DIR
-	string
 	default "h61m-cs"          if BOARD_ASUS_H61M_CS
 	default "p8h61-m_lx"       if BOARD_ASUS_P8H61_M_LX
 	default "p8h61-m_lx3_r2_0" if BOARD_ASUS_P8H61_M_LX3_R2_0
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index 8f3eb6723a..d56efd2b46 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -37,7 +37,6 @@ config MAINBOARD_PART_NUMBER
 	default "P3B-F" if BOARD_ASUS_P3B_F
 
 config VARIANT_DIR
-	string
 	default "p2b" if BOARD_ASUS_P2B
 	default "p2b-d" if BOARD_ASUS_P2B_D
 	default "p2b-ds" if BOARD_ASUS_P2B_DS
diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig
index 31ad4f3887..c501b7a010 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -19,7 +19,6 @@ config MAINBOARD_DIR
 	default "asus/p5qc"
 
 config VARIANT_DIR
-	string
 	default "p5qc" if BOARD_ASUS_P5QC
 	default "p5q_pro" if BOARD_ASUS_P5Q_PRO
 	default "p5ql_pro" if BOARD_ASUS_P5QL_PRO
diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig
index e54809ccf4..2359e324d8 100644
--- a/src/mainboard/asus/p5qpl-am/Kconfig
+++ b/src/mainboard/asus/p5qpl-am/Kconfig
@@ -23,7 +23,6 @@ config MAINBOARD_DIR
 	default "asus/p5qpl-am"
 
 config VARIANT_DIR
-	string
 	default "p5qpl-am" if BOARD_ASUS_P5QPL_AM
 	default "p5g41t-m_lx" if BOARD_ASUS_P5G41T_M_LX
 
diff --git a/src/mainboard/asus/p8x7x-series/Kconfig b/src/mainboard/asus/p8x7x-series/Kconfig
index 1e725b204d..4ecb4b4d38 100644
--- a/src/mainboard/asus/p8x7x-series/Kconfig
+++ b/src/mainboard/asus/p8x7x-series/Kconfig
@@ -19,7 +19,6 @@ config MAINBOARD_DIR
 	default "asus/p8x7x-series"
 
 config VARIANT_DIR
-	string
 	default "p8c_ws"      if BOARD_ASUS_P8C_WS
 	default "p8h77-v"     if BOARD_ASUS_P8H77_V
 	default "p8z77-m_pro" if BOARD_ASUS_P8Z77_M_PRO
diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
index d68e94995b..0452bc15fa 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -70,7 +70,6 @@ config POST_DEVICE
 	default n
 
 config VARIANT_DIR
-	string
 	default "l140cu" if BOARD_CLEVO_L140CU_BASE
 
 config SEABIOS_PS2_TIMEOUT
diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig
index 93ddb821c1..0b2f0b00ed 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -35,7 +35,6 @@ config MAINBOARD_DIR
 	default "clevo/kbl-u"
 
 config VARIANT_DIR
-	string
 	default "n13xwu" if BOARD_CLEVO_N130WU
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index cb6325f601..bbf46f7f34 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -23,7 +23,6 @@ config MAINBOARD_DIR
 	default "gigabyte/ga-945gcm-s2l"
 
 config VARIANT_DIR
-	string
 	default "ga-945gcm-s2l" if BOARD_GIGABYTE_GA_945GCM_S2L
 	default "ga-945gcm-s2c" if BOARD_GIGABYTE_GA_945GCM_S2C
 
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index d2c501e58f..643ed78eff 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -29,7 +29,6 @@ config MAINBOARD_DIR
 	default "gigabyte/ga-b75m-d3h"
 
 config VARIANT_DIR
-	string
 	default "ga-b75m-d3h" if BOARD_GIGABYTE_GA_B75M_D3H
 	default "ga-b75m-d3v" if BOARD_GIGABYTE_GA_B75M_D3V
 	default "ga-b75-d3v" if BOARD_GIGABYTE_GA_B75_D3V
diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
index d9d7787966..cec2c61d89 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -22,7 +22,6 @@ config MAINBOARD_DIR
 	default "gigabyte/ga-h61m-series"
 
 config VARIANT_DIR
-	string
 	default "ga-h61m-s2pv" if BOARD_GIGABYTE_GA_H61M_S2PV
 	default "ga-h61m-ds2v" if BOARD_GIGABYTE_GA_H61M_DS2V
 	default "ga-h61ma-d3v" if BOARD_GIGABYTE_GA_H61MA_D3V
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index b1b4583f89..0d37a10826 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -28,7 +28,6 @@ config MAINBOARD_DIR
 	default "google/auron"
 
 config VARIANT_DIR
-	string
 	default "auron_paine" if BOARD_GOOGLE_AURON_PAINE
 	default "auron_yuna" if BOARD_GOOGLE_AURON_YUNA
 	default "buddy" if BOARD_GOOGLE_BUDDY
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index fadb718518..8ecba7ad03 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -23,7 +23,6 @@ config MAINBOARD_DIR
 	default "google/beltino"
 
 config VARIANT_DIR
-	string
 	default "mccloud" if BOARD_GOOGLE_MCCLOUD
 	default "monroe" if BOARD_GOOGLE_MONROE
 	default "panther" if BOARD_GOOGLE_PANTHER
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 00d607c022..80e8d72bdd 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -75,7 +75,6 @@ config MAINBOARD_PART_NUMBER
 	default "Taeko" if BOARD_GOOGLE_TAEKO
 
 config VARIANT_DIR
-	string
 	default "brya0" if BOARD_GOOGLE_BRYA0
 	default "primus" if BOARD_GOOGLE_PRIMUS
 	default "gimble" if BOARD_GOOGLE_GIMBLE
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index b237c2115c..9640489253 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -41,7 +41,6 @@ config MAINBOARD_FAMILY
 	default ""
 
 config VARIANT_DIR
-	string
 	default "banon" if BOARD_GOOGLE_BANON
 	default "celes" if BOARD_GOOGLE_CELES
 	default "cyan" if BOARD_GOOGLE_CYAN
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index ac77b698a9..3cf1a3a81c 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -124,7 +124,6 @@ config UART_FOR_CONSOLE
 	default 2
 
 config VARIANT_DIR
-	string
 	default "boten" if BOARD_GOOGLE_BOTEN
 	default "boten" if BOARD_GOOGLE_BOTEN_LEGACY
 	default "dedede" if BOARD_GOOGLE_DEDEDE
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig
index 7ce87cff37..7ed70ac462 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -73,7 +73,6 @@ config UART_FOR_CONSOLE
 	default 2
 
 config VARIANT_DIR
-	string
 	default "deltan" if BOARD_GOOGLE_DELTAN
 	default "deltaur" if BOARD_GOOGLE_DELTAUR
 
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 8316e9b056..55f203e3fc 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -75,7 +75,6 @@ config UART_FOR_CONSOLE
 	default 0 if BOARD_GOOGLE_DRALLION
 
 config VARIANT_DIR
-	string
 	default "drallion" if BOARD_GOOGLE_DRALLION
 
 config DEVICETREE
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index 5153441c56..b7a6a620cd 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -69,7 +69,6 @@ config TPM_TIS_ACPI_INTERRUPT
 	default 64  # GPE0_DW2_00 (GPP_E0)
 
 config VARIANT_DIR
-	string
 	default "fizz" if BOARD_GOOGLE_FIZZ
 	default "karma" if BOARD_GOOGLE_KARMA
 	default "endeavour" if BOARD_GOOGLE_ENDEAVOUR
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 144dee31d5..cd553fffd6 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -50,7 +50,6 @@ config MAINBOARD_FAMILY
 	default "Google_Glados"
 
 config VARIANT_DIR
-	string
 	default "asuka" if BOARD_GOOGLE_ASUKA
 	default "caroline" if BOARD_GOOGLE_CAROLINE
 	default "cave" if BOARD_GOOGLE_CAVE
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index fa00c76f14..17cdada713 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -102,7 +102,6 @@ config EFS_SPI_SPEED
 	default 1          # 33.33 MHz
 
 config VARIANT_DIR
-	string
 	default "guybrush" if BOARD_GOOGLE_GUYBRUSH
 
 config DEVICETREE
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 947f816300..f11c6899a8 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -143,7 +143,6 @@ config TPM_TIS_ACPI_INTERRUPT
 	default 53 # GPE0_DW1_21 (GPP_C21)
 
 config VARIANT_DIR
-	string
 	default "akemi" if BOARD_GOOGLE_AKEMI
 	default "dratini" if BOARD_GOOGLE_DRATINI
 	default "duffy" if BOARD_GOOGLE_DUFFY
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index dc25f1908a..42be86ab28 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -22,7 +22,6 @@ config MAINBOARD_DIR
 
 
 config VARIANT_DIR
-	string
 	default "guado" if BOARD_GOOGLE_GUADO
 	default "jecht" if BOARD_GOOGLE_JECHT
 	default "rikku" if BOARD_GOOGLE_RIKKU
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 3128493732..5940d1a2b6 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -47,7 +47,6 @@ config VGA_BIOS_FILE
 	default "3rdparty/blobs/mainboard/google/kahlee/VBIOS_015_049_000_017.bin"
 
 config VARIANT_DIR
-	string
 	default "aleena" if BOARD_GOOGLE_ALEENA
 	default "careena" if BOARD_GOOGLE_CAREENA
 	default "grunt" if BOARD_GOOGLE_GRUNT
diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig
index 1a247e7efd..1e809ad861 100644
--- a/src/mainboard/google/mancomb/Kconfig
+++ b/src/mainboard/google/mancomb/Kconfig
@@ -84,7 +84,6 @@ config EFS_SPI_SPEED
 	default 1          # 33.33 MHz
 
 config VARIANT_DIR
-	string
 	default "mancomb" if BOARD_GOOGLE_MANCOMB
 
 config DEVICETREE
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 4caf5a022a..eb6cbc6efc 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -52,7 +52,6 @@ config MAINBOARD_DIR
 	default "google/octopus"
 
 config VARIANT_DIR
-	string
 	default "yorp" if BOARD_GOOGLE_YORP
 	default "phaser" if BOARD_GOOGLE_PHASER
 	default "fleex" if BOARD_GOOGLE_FLEEX
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 74be52744d..f4be0c53ae 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -114,7 +114,6 @@ config TPM_TIS_ACPI_INTERRUPT
 	default 64  # GPE0_DW2_00 (GPP_E0)
 
 config VARIANT_DIR
-	string
 	default "atlas" if BOARD_GOOGLE_ATLAS
 	default "poppy" if BOARD_GOOGLE_POPPY
 	default "nami" if BOARD_GOOGLE_NAMI
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 2c1b040f8c..983ca495e4 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -27,7 +27,6 @@ config MAINBOARD_DIR
 	default "google/rambi"
 
 config VARIANT_DIR
-	string
 	default "banjo" if BOARD_GOOGLE_BANJO
 	default "candy" if BOARD_GOOGLE_CANDY
 	default "clapper" if BOARD_GOOGLE_CLAPPER
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index d1de54fbad..9fee4a5ddd 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -49,7 +49,6 @@ config MAINBOARD_DIR
 	default "google/reef"
 
 config VARIANT_DIR
-	string
 	default "reef" if BOARD_GOOGLE_REEF
 	default "pyro" if BOARD_GOOGLE_PYRO
 	default "sand" if BOARD_GOOGLE_SAND
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 1398292de2..383436ae71 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -77,7 +77,6 @@ config UART_FOR_CONSOLE
 	default 2
 
 config VARIANT_DIR
-	string
 	default "arcada" if BOARD_GOOGLE_ARCADA
 	default "sarien" if BOARD_GOOGLE_SARIEN
 
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index c69a73a465..7bb717be29 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -30,7 +30,6 @@ config MAINBOARD_DIR
 	default "google/slippy"
 
 config VARIANT_DIR
-	string
 	default "falco" if BOARD_GOOGLE_FALCO
 	default "leon" if BOARD_GOOGLE_LEON
 	default "peppy" if BOARD_GOOGLE_PEPPY
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index e26070fcb3..73fe6c7142 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -128,7 +128,6 @@ config TPM_TIS_ACPI_INTERRUPT
 	default 21  # GPE0_DW0_21 (GPP_C21)
 
 config VARIANT_DIR
-	string
 	default "delbin" if BOARD_GOOGLE_DELBIN
 	default "eldrid" if BOARD_GOOGLE_ELDRID
 	default "halvor" if BOARD_GOOGLE_HALVOR
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index a9ca5dad6f..e93516e07e 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -64,7 +64,6 @@ config MAINBOARD_DIR
 	default "google/zork"
 
 config VARIANT_DIR
-	string
 	default "ezkinil" if BOARD_GOOGLE_EZKINIL
 	default "morphius" if BOARD_GOOGLE_MORPHIUS
 	default "trembyle" if BOARD_GOOGLE_TREMBYLE
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
index 583fd4b649..7a49bfdb26 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -20,7 +20,6 @@ config MAINBOARD_DIR
 	default "hp/snb_ivb_laptops"
 
 config VARIANT_DIR
-	string
 	default "2560p"          if BOARD_HP_2560P
 	default "2570p"          if BOARD_HP_2570P
 	default "2760p"          if BOARD_HP_2760P
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 608b8da3bb..f62292134d 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -35,7 +35,6 @@ config MAINBOARD_DIR
 	default "intel/adlrvp"
 
 config VARIANT_DIR
-	string
 	default "adlrvp_p" if BOARD_INTEL_ADLRVP_P
 	default "adlrvp_p_ext_ec" if BOARD_INTEL_ADLRVP_P_EXT_EC
 	default "adlrvp_m" if BOARD_INTEL_ADLRVP_M
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index f0c7f90060..74111b52d5 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -23,7 +23,6 @@ config MAINBOARD_DIR
 	default "intel/coffeelake_rvp"
 
 config VARIANT_DIR
-	string
 	default "cfl_u" if BOARD_INTEL_COFFEELAKE_RVPU
 	default "cfl_h" if BOARD_INTEL_COFFEELAKE_RVP11
 	default "whl_u" if BOARD_INTEL_WHISKEYLAKE_RVP
diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig
index 3fb995406b..0f880b5776 100644
--- a/src/mainboard/intel/elkhartlake_crb/Kconfig
+++ b/src/mainboard/intel/elkhartlake_crb/Kconfig
@@ -18,7 +18,6 @@ config MAINBOARD_DIR
 	default "intel/elkhartlake_crb"
 
 config VARIANT_DIR
-	string
 	default "ehlcrb" if BOARD_INTEL_ELKHARTLAKE_CRB
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 2d80b80d6b..b5e61d926e 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -49,7 +49,6 @@ config MAINBOARD_DIR
 	default "intel/glkrvp"
 
 config VARIANT_DIR
-	string
 	default "glkrvp" if BOARD_INTEL_GLKRVP
 
 config DEVICETREE
diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig
index b5088c3f14..4578afc1d5 100644
--- a/src/mainboard/intel/icelake_rvp/Kconfig
+++ b/src/mainboard/intel/icelake_rvp/Kconfig
@@ -22,7 +22,6 @@ config MAINBOARD_DIR
 	default "intel/icelake_rvp"
 
 config VARIANT_DIR
-	string
 	default "icl_u" if BOARD_INTEL_ICELAKE_RVPU
 	default "icl_y" if BOARD_INTEL_ICELAKE_RVPY
 
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig
index 88328d54a5..df5204fa53 100644
--- a/src/mainboard/intel/jasperlake_rvp/Kconfig
+++ b/src/mainboard/intel/jasperlake_rvp/Kconfig
@@ -25,7 +25,6 @@ config MAINBOARD_DIR
 	default "intel/jasperlake_rvp"
 
 config VARIANT_DIR
-	string
 	default "jslrvp" if BOARD_INTEL_JASPERLAKE_RVP || BOARD_INTEL_JASPERLAKE_RVP_EXT_EC
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index 5a4598b20a..2a0c135ca7 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -28,7 +28,6 @@ config MAINBOARD_DIR
 	default "intel/kblrvp"
 
 config VARIANT_DIR
-	string
 	default "rvp3" if BOARD_INTEL_KBLRVP3
 	default "rvp7" if BOARD_INTEL_KBLRVP7
 	default "rvp8" if BOARD_INTEL_KBLRVP8
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 4f4cf126ef..c745b57ec3 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -36,7 +36,6 @@ config MAINBOARD_DIR
 	default "intel/tglrvp"
 
 config VARIANT_DIR
-	string
 	default "tglrvp_up3" if BOARD_INTEL_TGLRVP_UP3
 	default "tglrvp_up4" if BOARD_INTEL_TGLRVP_UP4
 
diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig
index d79f374e7b..0c3282a21d 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -40,7 +40,6 @@ config MAINBOARD_PART_NUMBER
 	default "Boxer26" if BOARD_SIEMENS_BOXER26
 
 config VARIANT_DIR
-	string
 	default "bsl6" if BOARD_KONTRON_BSL6
 	default "boxer26" if BOARD_SIEMENS_BOXER26
 
diff --git a/src/mainboard/kontron/mal10/Kconfig b/src/mainboard/kontron/mal10/Kconfig
index 631dd76c89..021e17140a 100644
--- a/src/mainboard/kontron/mal10/Kconfig
+++ b/src/mainboard/kontron/mal10/Kconfig
@@ -35,7 +35,6 @@ config BOARD_KONTRON_T10_TNI
 endchoice
 
 config VARIANT_DIR
-	string
 	default "mal10"
 
 config CARRIER_DIR
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index 5e17eb5eea..74977eba92 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -49,7 +49,6 @@ config MAINBOARD_DIR
 	default "lenovo/t400"
 
 config VARIANT_DIR
-	string
 	default "t400" if BOARD_LENOVO_T400 || BOARD_LENOVO_T500 \
 		|| BOARD_LENOVO_R400 || BOARD_LENOVO_W500
 	default "r500" if BOARD_LENOVO_R500
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 88816859db..710dda2f71 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -51,7 +51,6 @@ config MAINBOARD_DIR
 	default "lenovo/t430s"
 
 config VARIANT_DIR
-	string
 	default "t430s" if BOARD_LENOVO_T430S
 	default "t431s" if BOARD_LENOVO_T431S
 
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index e8f1df7977..5e120566ff 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -43,7 +43,6 @@ config VBOOT_VBNV_OFFSET
 	default 0x2a
 
 config VARIANT_DIR
-	string
 	default "t520" if BOARD_LENOVO_T520
 	default "w520" if BOARD_LENOVO_W520
 
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index eb301db15c..c2d649c3a0 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -47,7 +47,6 @@ config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config VARIANT_DIR
-	string
 	default "t530" if BOARD_LENOVO_T530
 	default "w530" if BOARD_LENOVO_W530
 
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 80e9c0ee1c..c49cd0a5a5 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -27,7 +27,6 @@ config MAINBOARD_DIR
 	default "lenovo/t60"
 
 config VARIANT_DIR
-	string
 	default "t60" if BOARD_LENOVO_T60 || BOARD_LENOVO_R60
 	default "z61t" if BOARD_LENOVO_Z61T
 
diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
index c8783c1e72..b4d677ad7e 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -45,7 +45,6 @@ config MAINBOARD_DIR
 	default "lenovo/x200"
 
 config VARIANT_DIR
-	string
 	default "x200" if BOARD_LENOVO_X200
 	default "x301" if BOARD_LENOVO_X301
 
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index f4065d0fc7..8530e49dc5 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -45,7 +45,6 @@ config MAINBOARD_DIR
 	default "lenovo/x220"
 
 config VARIANT_DIR
-	string
 	default "x220" if BOARD_LENOVO_X220 || BOARD_LENOVO_X220I
 	default "x1" if BOARD_LENOVO_X1
 
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index cc9d708278..61144b89c6 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -51,7 +51,6 @@ config MAINBOARD_DIR
 	default "lenovo/x230"
 
 config VARIANT_DIR
-	string
 	default "x230" if BOARD_LENOVO_X230 || BOARD_LENOVO_X230T
 	default "x230s" if BOARD_LENOVO_X230S
 
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 7b34e647e6..e7472b1853 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -24,7 +24,6 @@ config MAINBOARD_DIR
 	default "lippert/frontrunner-af"
 
 config VARIANT_DIR
-	string
 	default "frontrunner-af" if BOARD_LIPPERT_FRONTRUNNER_AF
 	default "toucan-af"      if BOARD_LIPPERT_TOUCAN_AF
 
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 6a65e5eee3..b4e1e9e1aa 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -25,7 +25,6 @@ config MAINBOARD_DIR
 	default "pcengines/apu2"
 
 config VARIANT_DIR
-	string
 	default "apu2" if BOARD_PCENGINES_APU2
 	default "apu3" if BOARD_PCENGINES_APU3
 	default "apu4" if BOARD_PCENGINES_APU4
diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
index 55fc780757..bdb8e497b2 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/src/mainboard/prodrive/hermes/Kconfig
@@ -45,7 +45,6 @@ config PCIEXP_CLK_PM
 	default n
 
 config VARIANT_DIR
-	string
 	default "baseboard"	if BOARD_PRODRIVE_HERMES_BASEBOARD
 
 config MAX_CPUS
diff --git a/src/mainboard/protectli/vault_bsw/Kconfig b/src/mainboard/protectli/vault_bsw/Kconfig
index f328d3d6dc..23d1bfa42a 100644
--- a/src/mainboard/protectli/vault_bsw/Kconfig
+++ b/src/mainboard/protectli/vault_bsw/Kconfig
@@ -17,7 +17,6 @@ config MAINBOARD_DIR
 	default "protectli/vault_bsw"
 
 config VARIANT_DIR
-	string
 	default "fw2b" if BOARD_PROTECTLI_FW2B
 	default "fw4b" if BOARD_PROTECTLI_FW4B
 
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index a5898cb303..dfd1fe1b33 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -13,7 +13,6 @@ config BOARD_PURISM_BASEBOARD_LIBREM_BDW
 if BOARD_PURISM_BASEBOARD_LIBREM_BDW
 
 config VARIANT_DIR
-	string
 	default "librem13v1" if BOARD_PURISM_LIBREM13_V1
 	default "librem15v2" if BOARD_PURISM_LIBREM15_V2
 
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index c87d76364b..2c960fdfb7 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -29,7 +29,6 @@ config MAINBOARD_PART_NUMBER
 	default "Librem 14" if BOARD_PURISM_LIBREM_14
 
 config VARIANT_DIR
-	string
 	default "librem_mini" if BOARD_PURISM_LIBREM_MINI || BOARD_PURISM_LIBREM_MINI_V2
 	default "librem_14" if BOARD_PURISM_LIBREM_14
 
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index 191ca6ef79..35bd6f8d3a 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -23,7 +23,6 @@ config IRQ_SLOT_COUNT
 	default 18
 
 config VARIANT_DIR
-	string
 	default "librem13" if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM13_V4
 	default "librem15" if BOARD_PURISM_LIBREM15_V3 || BOARD_PURISM_LIBREM15_V4
 
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index dd4b2a0acb..0a6b0cb596 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -19,7 +19,6 @@ config MAINBOARD_DIR
 	default "roda/rv11"
 
 config VARIANT_DIR
-	string
 	default "rv11" if BOARD_RODA_RV11
 	default "rw11" if BOARD_RODA_RW11
 
diff --git a/src/mainboard/siemens/chili/Kconfig b/src/mainboard/siemens/chili/Kconfig
index e8c74f1b5e..470edf2dc8 100644
--- a/src/mainboard/siemens/chili/Kconfig
+++ b/src/mainboard/siemens/chili/Kconfig
@@ -45,7 +45,6 @@ config MAINBOARD_PART_NUMBER
 	default "Chili" if BOARD_SIEMENS_CHILI_CHILI
 
 config VARIANT_DIR
-	string
 	default "base" if BOARD_SIEMENS_CHILI_BASE
 	default "chili" if BOARD_SIEMENS_CHILI_CHILI
 
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index 9a41274008..f2f7e0e103 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -15,7 +15,6 @@ config MAINBOARD_DIR
 	default "siemens/mc_apl1"
 
 config VARIANT_DIR
-	string
 	default "mc_apl1" if BOARD_SIEMENS_MC_APL1
 	default "mc_apl2" if BOARD_SIEMENS_MC_APL2
 	default "mc_apl3" if BOARD_SIEMENS_MC_APL3
diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig
index 239c06ec70..fb8dc035ca 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/Kconfig
@@ -15,7 +15,6 @@ config MAINBOARD_DIR
 	default "siemens/mc_ehl"
 
 config VARIANT_DIR
-	string
 	default "mc_ehl1" if BOARD_SIEMENS_MC_EHL1
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index aa7965c49f..4fc0ff8539 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -31,7 +31,6 @@ config MAINBOARD_DIR
 	default "supermicro/x11-lga1151-series"
 
 config VARIANT_DIR
-	string
 	default "x11ssh-tf"	if BOARD_SUPERMICRO_X11SSH_TF
 	default "x11ssm-f"	if BOARD_SUPERMICRO_X11SSM_F
 	default "x11ssh-f"	if BOARD_SUPERMICRO_X11SSH_F
diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig
index 2493d745f0..1b8130a6b9 100644
--- a/src/mainboard/system76/whl-u/Kconfig
+++ b/src/mainboard/system76/whl-u/Kconfig
@@ -25,7 +25,6 @@ config MAINBOARD_DIR
 	default "system76/whl-u"
 
 config VARIANT_DIR
-	string
 	default "galp3-c" if BOARD_SYSTEM76_GALP3_C
 	default "darp5" if BOARD_SYSTEM76_DARP5