mb/*: Specify type of `MAINBOARD_DIR` once

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

Change-Id: If1cc538b0c4938dac193699897b690e402b3c1e8
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56553
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.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>
diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index efd21da..52d7c4e 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -25,7 +25,6 @@
 	default "1.0"
 
 config MAINBOARD_DIR
-	string
 	default "51nb/x210"
 
 config VGA_BIOS_ID
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index af685db..37f8119 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -10,6 +10,9 @@
 
 source "src/mainboard/*/Kconfig"
 
+config MAINBOARD_DIR
+	string
+
 config MAINBOARD_VENDOR
 	string "Mainboard vendor name"
 
diff --git a/src/mainboard/acer/g43t-am3/Kconfig b/src/mainboard/acer/g43t-am3/Kconfig
index 941070e..440dd06 100644
--- a/src/mainboard/acer/g43t-am3/Kconfig
+++ b/src/mainboard/acer/g43t-am3/Kconfig
@@ -25,7 +25,6 @@
 	default "8086,2e22"
 
 config MAINBOARD_DIR
-	string
 	default "acer/g43t-am3"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig
index 7b74de3..15b4fc2 100644
--- a/src/mainboard/amd/bilby/Kconfig
+++ b/src/mainboard/amd/bilby/Kconfig
@@ -48,7 +48,6 @@
 	default 0xfef000 # Maximum size for the Bilby FMAP
 
 config MAINBOARD_DIR
-	string
 	default "amd/bilby"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 94c098b..148d5f7 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -13,7 +13,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/gardenia"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 5cca387..2f2e798 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -15,7 +15,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/inagua"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index c592548..2096d2a 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -51,7 +51,6 @@
 	default 0xfcf000 if BOARD_AMD_CEREME # Maximum size for the Cereme FMAP
 
 config MAINBOARD_DIR
-	string
 	default "amd/mandolin"
 
 config VARIANT_DIR
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index e56200b..5bf02d8 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -16,7 +16,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/olivehill"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index b286665..461ec6d 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -19,7 +19,6 @@
 	select AZALIA_PLUGIN_SUPPORT
 
 config MAINBOARD_DIR
-	string
 	default "amd/padmelon"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index ce2f95d..7749092 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -16,7 +16,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/parmer"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index ae68fce..c5db4e5 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -16,7 +16,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/persimmon"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 5a0ac8b..1a644d9 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -15,7 +15,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/south_station"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index 95dc8f0..f91ff9e 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -17,7 +17,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/thatcher"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index a92b47b..bca4384 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -14,7 +14,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "amd/union_station"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig
index 4ee9b73..ba1c315 100644
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@@ -11,7 +11,6 @@
 	select BOARD_ROMSIZE_KB_2048
 
 config MAINBOARD_DIR
-	string
 	default "aopen/dxplplusu"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index 5d8f626..dc9e95f 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -18,7 +18,6 @@
 	select I945_LVDS
 
 config MAINBOARD_DIR
-	string
 	default "apple/macbook21"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 0f129a8..9d3ecfe 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -17,7 +17,6 @@
 	select HAVE_OPTION_TABLE
 
 config MAINBOARD_DIR
-	string
 	default "apple/macbookair4_2"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/b75pro3-m/Kconfig b/src/mainboard/asrock/b75pro3-m/Kconfig
index 6abfa6c..9f749a8 100644
--- a/src/mainboard/asrock/b75pro3-m/Kconfig
+++ b/src/mainboard/asrock/b75pro3-m/Kconfig
@@ -17,7 +17,6 @@
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
 
 config MAINBOARD_DIR
-	string
 	default "asrock/b75pro3-m"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/b85m_pro4/Kconfig b/src/mainboard/asrock/b85m_pro4/Kconfig
index f33bf34..85c7219 100644
--- a/src/mainboard/asrock/b85m_pro4/Kconfig
+++ b/src/mainboard/asrock/b85m_pro4/Kconfig
@@ -22,7 +22,6 @@
 	default 0x200000
 
 config MAINBOARD_DIR
-	string
 	default "asrock/b85m_pro4"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 3616d2d..10c8e1b 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -17,7 +17,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "asrock/e350m1"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index 6dfe4aa..afc0946 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -23,7 +23,6 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 
 config MAINBOARD_DIR
-	string
 	default "asrock/g41c-gs"
 
 config VARIANT_DIR
diff --git a/src/mainboard/asrock/h110m/Kconfig b/src/mainboard/asrock/h110m/Kconfig
index cec5db8..18ac118 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -22,7 +22,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "asrock/h110m"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/h81m-hds/Kconfig b/src/mainboard/asrock/h81m-hds/Kconfig
index 4741f28..cb80556 100644
--- a/src/mainboard/asrock/h81m-hds/Kconfig
+++ b/src/mainboard/asrock/h81m-hds/Kconfig
@@ -24,7 +24,6 @@
 	default 0x200000
 
 config MAINBOARD_DIR
-	string
 	default "asrock/h81m-hds"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index 9879b81..9269583 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -17,7 +17,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "asrock/imb-a180"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/a88xm-e/Kconfig b/src/mainboard/asus/a88xm-e/Kconfig
index 17fbe28..5a17545 100644
--- a/src/mainboard/asus/a88xm-e/Kconfig
+++ b/src/mainboard/asus/a88xm-e/Kconfig
@@ -17,7 +17,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "asus/a88xm-e"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/am1i-a/Kconfig b/src/mainboard/asus/am1i-a/Kconfig
index 365043c..89f5773 100644
--- a/src/mainboard/asus/am1i-a/Kconfig
+++ b/src/mainboard/asus/am1i-a/Kconfig
@@ -18,7 +18,6 @@
 	select MAINBOARD_HAS_LPC_TPM
 
 config MAINBOARD_DIR
-	string
 	default "asus/am1i-a"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index 6a57263..3597b40 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -42,7 +42,6 @@
 	default 0x1e if BOARD_ASUS_F2A85_M_DDR3_VOLT_165
 
 config MAINBOARD_DIR
-	string
 	default "asus/f2a85-m"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index aed784a..c17f3f9 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -15,7 +15,6 @@
 if BOARD_ASUS_H61_SERIES
 
 config MAINBOARD_DIR
-	string
 	default "asus/h61-series"
 
 config VARIANT_DIR
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
index 6234365..01082db 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig
+++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
@@ -21,7 +21,6 @@
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 config MAINBOARD_DIR
-	string
 	default "asus/maximus_iv_gene-z"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index ab0a819..b6ccca8 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -26,7 +26,6 @@
 	default 2 if BASE_ASUS_P2B_D
 
 config MAINBOARD_DIR
-	string
 	default "asus/p2b"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig
index ff3bbca..0e9aa30 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -19,7 +19,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "asus/p5gc-mx"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig
index defe15e..414a8f1 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -16,7 +16,6 @@
 	select ATHEROS_ATL1E_SETMAC
 
 config MAINBOARD_DIR
-	string
 	default "asus/p5qc"
 
 config VARIANT_DIR
diff --git a/src/mainboard/asus/p5ql-em/Kconfig b/src/mainboard/asus/p5ql-em/Kconfig
index e68b92e..81b5fa0 100644
--- a/src/mainboard/asus/p5ql-em/Kconfig
+++ b/src/mainboard/asus/p5ql-em/Kconfig
@@ -18,7 +18,6 @@
 	select REALTEK_8168_RESET
 
 config MAINBOARD_DIR
-	string
 	default "asus/p5ql-em"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig
index cfa4c59..9cc9a40 100644
--- a/src/mainboard/asus/p5qpl-am/Kconfig
+++ b/src/mainboard/asus/p5qpl-am/Kconfig
@@ -20,7 +20,6 @@
 	select ATHEROS_ATL1E_SETMAC if BOARD_ASUS_P5QPL_AM
 
 config MAINBOARD_DIR
-	string
 	default "asus/p5qpl-am"
 
 config VARIANT_DIR
diff --git a/src/mainboard/asus/p8x7x-series/Kconfig b/src/mainboard/asus/p8x7x-series/Kconfig
index bc246e7..95097cc 100644
--- a/src/mainboard/asus/p8x7x-series/Kconfig
+++ b/src/mainboard/asus/p8x7x-series/Kconfig
@@ -16,7 +16,6 @@
 if BOARD_ASUS_P8X7X_SERIES
 
 config MAINBOARD_DIR
-	string
 	default "asus/p8x7x-series"
 
 config VARIANT_DIR
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig
index 7e9e583..bd18bfe 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -17,7 +17,6 @@
 	select HAVE_SPD_IN_CBFS
 
 config MAINBOARD_DIR
-	string
 	default "bap/ode_e20XX"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig
index 14c7e6d..8f36e92 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig
+++ b/src/mainboard/biostar/a68n_5200/Kconfig
@@ -15,7 +15,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "biostar/a68n_5200"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/biostar/am1ml/Kconfig b/src/mainboard/biostar/am1ml/Kconfig
index e550bfc..e6b6f1a 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -18,7 +18,6 @@
 	select SUPERIO_ITE_IT8728F
 
 config MAINBOARD_DIR
-	string
 	default "biostar/am1ml"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/biostar/th61-itx/Kconfig b/src/mainboard/biostar/th61-itx/Kconfig
index 2719853..4cccf7f 100644
--- a/src/mainboard/biostar/th61-itx/Kconfig
+++ b/src/mainboard/biostar/th61-itx/Kconfig
@@ -19,7 +19,6 @@
 	select NO_UART_ON_SUPERIO
 
 config MAINBOARD_DIR
-	string
 	default "biostar/th61-itx"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/bostentech/gbyt4/Kconfig b/src/mainboard/bostentech/gbyt4/Kconfig
index a267840..d30bbc3 100644
--- a/src/mainboard/bostentech/gbyt4/Kconfig
+++ b/src/mainboard/bostentech/gbyt4/Kconfig
@@ -10,7 +10,6 @@
 	select SUPERIO_ITE_IT8728F
 
 config MAINBOARD_DIR
-	string
 	default "bostentech/gbyt4"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/cavium/cn8100_sff_evb/Kconfig b/src/mainboard/cavium/cn8100_sff_evb/Kconfig
index 721149e..e5005d5 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig
+++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig
@@ -13,7 +13,6 @@
 	select MISSING_BOARD_RESET
 
 config MAINBOARD_DIR
-	string
 	default "cavium/cn8100_sff_evb"
 
 config DRAM_SIZE_MB
diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
index f594e4e..3696706 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -26,7 +26,6 @@
 if BOARD_CLEVO_CMLU_COMMON
 
 config MAINBOARD_DIR
-	string
 	default "clevo/cml-u"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig
index 9ef3f88..1bdcbb6 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -32,7 +32,6 @@
 	select GBB_FLAG_DISABLE_FWMP
 
 config MAINBOARD_DIR
-	string
 	default "clevo/kbl-u"
 
 config VARIANT_DIR
diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig
index 5ea4937..2738410 100644
--- a/src/mainboard/compulab/intense_pc/Kconfig
+++ b/src/mainboard/compulab/intense_pc/Kconfig
@@ -17,7 +17,6 @@
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 config MAINBOARD_DIR
-	string
 	default "compulab/intense_pc"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/dell/optiplex_9010/Kconfig b/src/mainboard/dell/optiplex_9010/Kconfig
index 1f505b0..a35fa7b 100644
--- a/src/mainboard/dell/optiplex_9010/Kconfig
+++ b/src/mainboard/dell/optiplex_9010/Kconfig
@@ -21,7 +21,6 @@
 	select PCIEXP_L1_SUB_STATE
 
 config MAINBOARD_DIR
-	string
 	default "dell/optiplex_9010"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/elmex/pcm205400/Kconfig b/src/mainboard/elmex/pcm205400/Kconfig
index e9c2ac4..ffd5bb1 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig
+++ b/src/mainboard/elmex/pcm205400/Kconfig
@@ -28,7 +28,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "elmex/pcm205400"
 
 config HW_MEM_HOLE_SIZEK
diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig
index 06a7ea8..e8cc262 100644
--- a/src/mainboard/emulation/qemu-aarch64/Kconfig
+++ b/src/mainboard/emulation/qemu-aarch64/Kconfig
@@ -27,7 +27,6 @@
 	default "src/mainboard/emulation/qemu-aarch64/memlayout.ld"
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-aarch64"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index a912998..75fefe4 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -29,7 +29,6 @@
 	default "src/mainboard/emulation/qemu-armv7/memlayout.ld"
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-armv7"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 19f0fca..3b13fa7 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -52,7 +52,6 @@
 	default 0x2c
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-i440fx"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/qemu-power8/Kconfig b/src/mainboard/emulation/qemu-power8/Kconfig
index 5dbea72..0999eb8 100644
--- a/src/mainboard/emulation/qemu-power8/Kconfig
+++ b/src/mainboard/emulation/qemu-power8/Kconfig
@@ -22,7 +22,6 @@
 	default "src/mainboard/emulation/qemu-power8/memlayout.ld"
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-power8"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index c3b6ea6..8684b54 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -53,7 +53,6 @@
 	default 0x2c
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-q35"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index ee0f337..4b86ce8 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -35,7 +35,6 @@
 	default "src/mainboard/emulation/qemu-riscv/memlayout.ld"
 
 config MAINBOARD_DIR
-	string
 	default "emulation/qemu-riscv"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig
index 3c1ae12..df79c29 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig
+++ b/src/mainboard/emulation/spike-riscv/Kconfig
@@ -16,7 +16,6 @@
 	default "src/mainboard/emulation/spike-riscv/memlayout.ld"
 
 config MAINBOARD_DIR
-	string
 	default "emulation/spike-riscv"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index 7426416..6db8c19 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -54,7 +54,6 @@
 	  Samsung K4B8G1646D memory
 
 config MAINBOARD_DIR
-	string
 	default "facebook/fbg1701"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/facebook/monolith/Kconfig b/src/mainboard/facebook/monolith/Kconfig
index d592f60..434f87a 100644
--- a/src/mainboard/facebook/monolith/Kconfig
+++ b/src/mainboard/facebook/monolith/Kconfig
@@ -21,7 +21,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "facebook/monolith"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/foxconn/d41s/Kconfig b/src/mainboard/foxconn/d41s/Kconfig
index e0aed55..6e82c62 100644
--- a/src/mainboard/foxconn/d41s/Kconfig
+++ b/src/mainboard/foxconn/d41s/Kconfig
@@ -18,7 +18,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "foxconn/d41s"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig
index 7a69655..f8add62 100644
--- a/src/mainboard/foxconn/g41s-k/Kconfig
+++ b/src/mainboard/foxconn/g41s-k/Kconfig
@@ -18,7 +18,6 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 
 config MAINBOARD_DIR
-	string
 	default "foxconn/g41s-k"
 
 config VARIANT_DIR
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 55a3646..d9864b0 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -23,7 +23,6 @@
 	select I945_LVDS
 
 config MAINBOARD_DIR
-	string
 	default "getac/p470"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index 9a8bf5b..1bb61cf 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -20,7 +20,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "gigabyte/ga-945gcm-s2l"
 
 config VARIANT_DIR
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index 6edbe01..4db6622 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -26,7 +26,6 @@
 	default 2
 
 config MAINBOARD_DIR
-	string
 	default "gigabyte/ga-b75m-d3h"
 
 config VARIANT_DIR
diff --git a/src/mainboard/gigabyte/ga-d510ud/Kconfig b/src/mainboard/gigabyte/ga-d510ud/Kconfig
index 71fe981..03627ac 100644
--- a/src/mainboard/gigabyte/ga-d510ud/Kconfig
+++ b/src/mainboard/gigabyte/ga-d510ud/Kconfig
@@ -17,7 +17,6 @@
 	select SUPERIO_ITE_IT8720F
 
 config MAINBOARD_DIR
-	string
 	default "gigabyte/ga-d510ud"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
index 8fbc8cc..205838b 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
@@ -21,7 +21,6 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 
 config MAINBOARD_DIR
-	string
 	default "gigabyte/ga-g41m-es2l"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
index cfbed99..d7d759e 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -19,7 +19,6 @@
 	select HAVE_CMOS_DEFAULT
 
 config MAINBOARD_DIR
-	string
 	default "gigabyte/ga-h61m-series"
 
 config VARIANT_DIR
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index 5bf296e..713fd05 100644
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -16,7 +16,6 @@
 	select HAVE_SPD_IN_CBFS
 
 config MAINBOARD_DIR
-	string
 	default "gizmosphere/gizmo"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index 9337290..82faaa6 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -18,7 +18,6 @@
 	select HAVE_SPD_IN_CBFS
 
 config MAINBOARD_DIR
-	string
 	default "gizmosphere/gizmo2"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/asurada/Kconfig b/src/mainboard/google/asurada/Kconfig
index 8951008..1e33e4c 100644
--- a/src/mainboard/google/asurada/Kconfig
+++ b/src/mainboard/google/asurada/Kconfig
@@ -33,7 +33,6 @@
 	select COMMONLIB_STORAGE_MMC
 
 config MAINBOARD_DIR
-	string
 	default "google/asurada"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 45e4e3af..8e8851a 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -25,7 +25,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/auron"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index 9cd71a8..80c0444 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -20,7 +20,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/beltino"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index ec833f5..4a635a3 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -62,7 +62,6 @@
 	default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
 config MAINBOARD_DIR
-	string
 	default "google/brya"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 2bcff1c..ea231c9 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -26,7 +26,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/butterfly"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/cherry/Kconfig b/src/mainboard/google/cherry/Kconfig
index 09b21d2..b1533ce 100644
--- a/src/mainboard/google/cherry/Kconfig
+++ b/src/mainboard/google/cherry/Kconfig
@@ -29,7 +29,6 @@
 	select HAVE_LINEAR_FRAMEBUFFER
 
 config MAINBOARD_DIR
-	string
 	default "google/cherry"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 5511d0a..9c6e5d8 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -33,7 +33,6 @@
 	  When enabled displays the memory configuration data.
 
 config MAINBOARD_DIR
-	string
 	default "google/cyan"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index 659e330..55ac2d2 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -22,7 +22,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/daisy"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 81f28fc..34fb0e0 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -82,7 +82,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
 
 config MAINBOARD_DIR
-	string
 	default "google/dedede"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig
index c861aec..aecf11d 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -57,7 +57,6 @@
 	default n
 
 config MAINBOARD_DIR
-	string
 	default "google/deltaur"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 9499a60..bc40430 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -61,7 +61,6 @@
 	default n
 
 config MAINBOARD_DIR
-	string
 	default "google/drallion"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig
index af5f8cd..523c84d 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -51,7 +51,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "google/eve"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index afa8f90..f419823 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -45,7 +45,6 @@
 	default 0x1
 
 config MAINBOARD_DIR
-	string
 	default "google/fizz"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 61c445c..c33c6ca 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -18,7 +18,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/foster"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index 214a18e..87ecbbd 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -27,7 +27,6 @@
 	default n
 
 config MAINBOARD_DIR
-	string
 	default "google/gale"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index bd4e649..6aba540 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -34,7 +34,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "google/glados"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index cf226b4..551b9a4 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -53,7 +53,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/gru"
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index b57fc62..e42e9e9 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -69,7 +69,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
 
 config MAINBOARD_DIR
-	string
 	default "google/guybrush"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index cde7c37..2a099c7 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -105,7 +105,6 @@
 endif
 
 config MAINBOARD_DIR
-	string
 	default "google/hatch"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/herobrine/Kconfig b/src/mainboard/google/herobrine/Kconfig
index 38bb328..ef4e7a3 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -28,7 +28,6 @@
 	select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_SENOR
 
 config MAINBOARD_DIR
-	string
 	default "google/herobrine"
 
 config MAINBOARD_VENDOR
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index dac8f3b..771925b 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -18,7 +18,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/jecht"
 
 
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 8cf0ff4..73d728b 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -38,7 +38,6 @@
 if BOARD_GOOGLE_BASEBOARD_KAHLEE
 
 config MAINBOARD_DIR
-	string
 	default "google/kahlee"
 
 config VGA_BIOS_FILE
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index 97b6fed..2ac99d5 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -39,7 +39,6 @@
 	select MT8183_DRAM_EMCP if BOARD_GOOGLE_KRANE || BOARD_GOOGLE_KAKADU || BOARD_GOOGLE_KATSU
 
 config MAINBOARD_DIR
-	string
 	default "google/kukui"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 427e99d..5cee6c1 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -26,7 +26,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/link"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig
index de17454..7b4c5d7 100644
--- a/src/mainboard/google/mancomb/Kconfig
+++ b/src/mainboard/google/mancomb/Kconfig
@@ -51,7 +51,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
 
 config MAINBOARD_DIR
-	string
 	default "google/mancomb"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig
index b7d0d31..fafa011 100644
--- a/src/mainboard/google/mistral/Kconfig
+++ b/src/mainboard/google/mistral/Kconfig
@@ -21,7 +21,6 @@
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 
 config MAINBOARD_DIR
-	string
 	default "google/mistral"
 
 ##########################################################
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 56ec398..cfb13dd 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -21,7 +21,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/nyan"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 7c65595..41ef484 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -23,7 +23,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/nyan_big"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 59f7912c..daae1c8 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -23,7 +23,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/nyan_blaze"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index 7f0d8b5..4ef6337 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -26,7 +26,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/oak"
 
 config EC_GOOGLE_CHROMEEC_SPI_BUS
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 611aa35..3967179 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -49,7 +49,6 @@
 	select VBOOT_LID_SWITCH
 
 config MAINBOARD_DIR
-	string
 	default "google/octopus"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 164717c..e94e29a 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -27,7 +27,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/parrot"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index e3da4b9..657fe49 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -20,7 +20,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/peach_pit"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 134246c..2c0540b 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -85,7 +85,6 @@
 	select NHLT_MAX98927
 
 config MAINBOARD_DIR
-	string
 	default "google/poppy"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 4748d45..0b05485 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -24,7 +24,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/rambi"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 9744d74..9b8f422 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -46,7 +46,6 @@
 	select VBOOT_LID_SWITCH if BASEBOARD_REEF_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "google/reef"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 144e244..1a382da 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -57,7 +57,6 @@
 	default n
 
 config MAINBOARD_DIR
-	string
 	default "google/sarien"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index c9ca334..5890da2 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -27,7 +27,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/slippy"
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index ef619c4..d1e408f 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -25,7 +25,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/smaug"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index e17109c..de391ea 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -25,7 +25,6 @@
 	default n
 
 config MAINBOARD_DIR
-	string
 	default "google/storm"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index d4d99f5..59a8849 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -25,7 +25,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "google/stout"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index e29fd9f..a8ba53e 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -44,7 +44,6 @@
 	select VBOOT_MOCK_SECDATA if BOARD_GOOGLE_BUBS
 
 config MAINBOARD_DIR
-	string
 	default "google/trogdor"
 
 config DRIVER_TPM_SPI_BUS
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 00094cd1..82f44b2 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -33,7 +33,6 @@
 	select VBOOT_VBNV_EC
 
 config MAINBOARD_DIR
-	string
 	default "google/veyron"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index b958c06..4cd626b 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -18,7 +18,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/veyron_mickey"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index b5f6b2d..7c86ca5 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -18,7 +18,6 @@
 	select VBOOT_VBNV_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "google/veyron_rialto"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 74ff92d..67b6c7c 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -81,7 +81,6 @@
 	default 0x50
 
 config MAINBOARD_DIR
-	string
 	default "google/volteer"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index aff1898..b0edf30 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -62,7 +62,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd"
 
 config MAINBOARD_DIR
-	string
 	default "google/zork"
 
 config VARIANT_DIR
diff --git a/src/mainboard/hp/280_g2/Kconfig b/src/mainboard/hp/280_g2/Kconfig
index 10f6828..e76fef6 100644
--- a/src/mainboard/hp/280_g2/Kconfig
+++ b/src/mainboard/hp/280_g2/Kconfig
@@ -17,7 +17,6 @@
 	select SUPERIO_ITE_COMMON_PRE_RAM
 
 config MAINBOARD_DIR
-	string
 	default "hp/280_g2"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/hp/abm/Kconfig b/src/mainboard/hp/abm/Kconfig
index 495254b..5ea2992 100644
--- a/src/mainboard/hp/abm/Kconfig
+++ b/src/mainboard/hp/abm/Kconfig
@@ -15,7 +15,6 @@
 	select BOARD_ROMSIZE_KB_8192
 
 config MAINBOARD_DIR
-	string
 	default "hp/abm"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index 038a32e..61c3a6c 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -23,7 +23,6 @@
 	default 0x2F0000
 
 config MAINBOARD_DIR
-	string
 	default "hp/compaq_8200_elite_sff"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/hp/folio_9480m/Kconfig b/src/mainboard/hp/folio_9480m/Kconfig
index 545a67b..7b55eb0 100644
--- a/src/mainboard/hp/folio_9480m/Kconfig
+++ b/src/mainboard/hp/folio_9480m/Kconfig
@@ -20,7 +20,6 @@
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "hp/folio_9480m"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
index 0262362..f50ccbf 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -21,7 +21,6 @@
 	select NO_UART_ON_SUPERIO
 
 config MAINBOARD_DIR
-	string
 	default "hp/pavilion_m6_1035dx"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
index 812c630b..0fcbb0d 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -17,7 +17,6 @@
 if BOARD_HP_SNB_IVB_LAPTOPS
 
 config MAINBOARD_DIR
-	string
 	default "hp/snb_ivb_laptops"
 
 config VARIANT_DIR
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_sff_workstation/Kconfig
index 935547f..3c4df00 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig
@@ -36,7 +36,6 @@
 	default 0x570000
 
 config MAINBOARD_DIR
-	string
 	default "hp/z220_sff_workstation"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 66d85f3..4088465 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -17,7 +17,6 @@
 	select INTEL_INT15
 
 config MAINBOARD_DIR
-	string
 	default "ibase/mb899"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 8510c38..5e49ea9 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -32,7 +32,6 @@
 	select HAS_RECOVERY_MRC_CACHE
 
 config MAINBOARD_DIR
-	string
 	default "intel/adlrvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/apollolake_rvp/Kconfig b/src/mainboard/intel/apollolake_rvp/Kconfig
index dfd86eb..45a8556 100644
--- a/src/mainboard/intel/apollolake_rvp/Kconfig
+++ b/src/mainboard/intel/apollolake_rvp/Kconfig
@@ -8,7 +8,6 @@
 	select INTEL_LPSS_UART_FOR_CONSOLE
 
 config MAINBOARD_DIR
-	string
 	default "intel/apollolake_rvp"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index b2d0653..ab3e5e8 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -16,7 +16,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "intel/baskingridge"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/cedarisland_crb/Kconfig b/src/mainboard/intel/cedarisland_crb/Kconfig
index 417931e..76135b4 100644
--- a/src/mainboard/intel/cedarisland_crb/Kconfig
+++ b/src/mainboard/intel/cedarisland_crb/Kconfig
@@ -9,7 +9,6 @@
 	select HAVE_ACPI_TABLES
 
 config MAINBOARD_DIR
-	string
 	default "intel/cedarisland_crb"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig
index e4c2d90..132d176 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -20,7 +20,6 @@
 	select MAINBOARD_HAS_LPC_TPM
 
 config MAINBOARD_DIR
-	string
 	default "intel/coffeelake_rvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/d510mo/Kconfig b/src/mainboard/intel/d510mo/Kconfig
index 6e7552c..49b988f 100644
--- a/src/mainboard/intel/d510mo/Kconfig
+++ b/src/mainboard/intel/d510mo/Kconfig
@@ -18,7 +18,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "intel/d510mo"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 06e1a0c..00844e3 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -20,7 +20,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "intel/d945gclf"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig
index 13e176a..70443df 100644
--- a/src/mainboard/intel/dcp847ske/Kconfig
+++ b/src/mainboard/intel/dcp847ske/Kconfig
@@ -26,7 +26,6 @@
 endmenu
 
 config MAINBOARD_DIR
-	string
 	default "intel/dcp847ske"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/dg41wv/Kconfig b/src/mainboard/intel/dg41wv/Kconfig
index b90f263..60708b7 100644
--- a/src/mainboard/intel/dg41wv/Kconfig
+++ b/src/mainboard/intel/dg41wv/Kconfig
@@ -18,7 +18,6 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 
 config MAINBOARD_DIR
-	string
 	default "intel/dg41wv"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/dg43gt/Kconfig b/src/mainboard/intel/dg43gt/Kconfig
index 2e7b81e..bad8487 100644
--- a/src/mainboard/intel/dg43gt/Kconfig
+++ b/src/mainboard/intel/dg43gt/Kconfig
@@ -26,7 +26,6 @@
 	default "8086,2e22"
 
 config MAINBOARD_DIR
-	string
 	default "intel/dg43gt"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig
index ed1a4c1..9f1f910 100644
--- a/src/mainboard/intel/elkhartlake_crb/Kconfig
+++ b/src/mainboard/intel/elkhartlake_crb/Kconfig
@@ -15,7 +15,6 @@
 	select SOC_INTEL_ELKHARTLAKE
 
 config MAINBOARD_DIR
-	string
 	default "intel/elkhartlake_crb"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index c37da03..10519e3 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -18,7 +18,6 @@
 	#select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "intel/emeraldlake2"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 37db0c6..e4a6bb5 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -14,7 +14,6 @@
 
 
 config MAINBOARD_DIR
-	string
 	default "intel/galileo"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index 7fda90d..b3d5d84 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -46,7 +46,6 @@
 	select EC_GOOGLE_CHROMEEC_SWITCHES if GLK_CHROME_EC
 
 config MAINBOARD_DIR
-	string
 	default "intel/glkrvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/harcuvar/Kconfig b/src/mainboard/intel/harcuvar/Kconfig
index 05a8d2d..f383775 100644
--- a/src/mainboard/intel/harcuvar/Kconfig
+++ b/src/mainboard/intel/harcuvar/Kconfig
@@ -9,7 +9,6 @@
 	select HAVE_ACPI_TABLES
 
 config MAINBOARD_DIR
-	string
 	default "intel/harcuvar"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig
index 69559ed..6cac590 100644
--- a/src/mainboard/intel/icelake_rvp/Kconfig
+++ b/src/mainboard/intel/icelake_rvp/Kconfig
@@ -19,7 +19,6 @@
 	select INTEL_LPSS_UART_FOR_CONSOLE
 
 config MAINBOARD_DIR
-	string
 	default "intel/icelake_rvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig
index 26c96aa..1112f6b 100644
--- a/src/mainboard/intel/jasperlake_rvp/Kconfig
+++ b/src/mainboard/intel/jasperlake_rvp/Kconfig
@@ -22,7 +22,6 @@
 	select SOC_INTEL_CSE_LITE_SKU
 
 config MAINBOARD_DIR
-	string
 	default "intel/jasperlake_rvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig
index fcce402..1e4a845 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -25,7 +25,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "intel/kblrvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index cf67ca1..3e37fde 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -30,7 +30,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "intel/kunimitsu"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig
index 652a659..83dd539 100644
--- a/src/mainboard/intel/leafhill/Kconfig
+++ b/src/mainboard/intel/leafhill/Kconfig
@@ -8,7 +8,6 @@
 	select INTEL_LPSS_UART_FOR_CONSOLE
 
 config MAINBOARD_DIR
-	string
 	default "intel/leafhill"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig
index 0c86df6..f33a182 100644
--- a/src/mainboard/intel/minnow3/Kconfig
+++ b/src/mainboard/intel/minnow3/Kconfig
@@ -8,7 +8,6 @@
 	select INTEL_LPSS_UART_FOR_CONSOLE
 
 config MAINBOARD_DIR
-	string
 	default "intel/minnow3"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/saddlebrook/Kconfig b/src/mainboard/intel/saddlebrook/Kconfig
index e7aaae5..b1b44c6 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -21,7 +21,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "intel/saddlebrook"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/shadowmountain/Kconfig b/src/mainboard/intel/shadowmountain/Kconfig
index 94a279f..fedd6b7 100644
--- a/src/mainboard/intel/shadowmountain/Kconfig
+++ b/src/mainboard/intel/shadowmountain/Kconfig
@@ -47,7 +47,6 @@
 	default "variants/baseboard/devicetree.cb"
 
 config MAINBOARD_DIR
-	string
 	default "intel/shadowmountain"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 1db86dc2..9574262 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -23,7 +23,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "intel/strago"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig
index 4dc2d56..efd8f01 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -33,7 +33,6 @@
 	select VBOOT_EARLY_EC_SYNC
 
 config MAINBOARD_DIR
-	string
 	default "intel/tglrvp"
 
 config VARIANT_DIR
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index 6312220..4b1fabe 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -15,7 +15,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "intel/wtm2"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 2e28784..2076308 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -16,7 +16,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "jetway/nf81-t56n-lf"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 1a527d6..a490d5b 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -19,7 +19,6 @@
 	select BOOT_DEVICE_NOT_SPI_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "kontron/986lcd-m"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig
index 1592d55..2fbe413 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -29,7 +29,6 @@
 if BOARD_KONTRON_BSL6_COMMON
 
 config MAINBOARD_DIR
-	string
 	default "kontron/bsl6"
 
 config MAINBOARD_VENDOR
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 52798bf..4ca8ecf3 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -16,7 +16,6 @@
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 config MAINBOARD_DIR
-	string
 	default "kontron/ktqm77"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/kontron/mal10/Kconfig b/src/mainboard/kontron/mal10/Kconfig
index 8a4cf6d..51238a5 100644
--- a/src/mainboard/kontron/mal10/Kconfig
+++ b/src/mainboard/kontron/mal10/Kconfig
@@ -16,7 +16,6 @@
 	select SOC_INTEL_APOLLOLAKE
 
 config MAINBOARD_DIR
-	string
 	default "kontron/mal10"
 
 # TODO: Add a new carrier boards here
diff --git a/src/mainboard/lenovo/g505s/Kconfig b/src/mainboard/lenovo/g505s/Kconfig
index e6278af..17de81b 100644
--- a/src/mainboard/lenovo/g505s/Kconfig
+++ b/src/mainboard/lenovo/g505s/Kconfig
@@ -19,7 +19,6 @@
 	select NO_UART_ON_SUPERIO
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/g505s"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig
index 33879cd..1900f05 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -19,7 +19,6 @@
 	select USE_NATIVE_RAMINIT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/l520"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index fde744f..83e3e13 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -21,7 +21,6 @@
 	select HAVE_SPD_IN_CBFS
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/s230u"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index a7e3922..ae3eb2a 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -47,7 +47,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t400"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig
index 804043d..97803273 100644
--- a/src/mainboard/lenovo/t410/Kconfig
+++ b/src/mainboard/lenovo/t410/Kconfig
@@ -47,7 +47,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t410"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 578a652..f0ae362 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -48,7 +48,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t420"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 3616a8d..5e9e051 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -47,7 +47,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t420s"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index 287e5f6..d5a1582 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -46,7 +46,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t430"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 6f1568d..dfbcfc4 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -49,7 +49,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t430s"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig
index b84576d..7fb62ae 100644
--- a/src/mainboard/lenovo/t440p/Kconfig
+++ b/src/mainboard/lenovo/t440p/Kconfig
@@ -43,7 +43,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t440p"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 077bec2..325189e 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -48,7 +48,6 @@
 	default "w520" if BOARD_LENOVO_W520
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t520"
 
 config OVERRIDE_DEVICETREE
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 17e248d..2f50ef5 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -53,7 +53,6 @@
 	default "w530" if BOARD_LENOVO_W530
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t530"
 
 config OVERRIDE_DEVICETREE
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index e4246b4..af167b6 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -24,7 +24,6 @@
 	select INTEL_GMA_HAVE_VBT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/t60"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/thinkcentre_a58/Kconfig b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
index 419f012..ad9a32b 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/Kconfig
+++ b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
@@ -18,7 +18,6 @@
 	select MAINBOARD_HAS_LIBGFXINIT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/thinkcentre_a58"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/w541/Kconfig b/src/mainboard/lenovo/w541/Kconfig
index efa3a12..e6f53ba 100644
--- a/src/mainboard/lenovo/w541/Kconfig
+++ b/src/mainboard/lenovo/w541/Kconfig
@@ -26,7 +26,6 @@
 	default "DP3"
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/w541"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index 4508e5e..e7f262a 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -41,7 +41,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x131e"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index 0bec670..3a00c412 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -47,7 +47,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x1_carbon_gen1"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
index bd25936..0f90a27 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -43,7 +43,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x200"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
index e920816..4fff82b 100644
--- a/src/mainboard/lenovo/x201/Kconfig
+++ b/src/mainboard/lenovo/x201/Kconfig
@@ -43,7 +43,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x201"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 9845089..f07aa42 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -42,7 +42,6 @@
 	default 0x2a
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x220"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index a6fdd7b..9e2020e 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -49,7 +49,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x230"
 
 config VARIANT_DIR
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 3a82179..6f7aebd 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -44,7 +44,6 @@
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	string
 	default "lenovo/x60"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/libretrend/lt1000/Kconfig b/src/mainboard/libretrend/lt1000/Kconfig
index 2610e8b..f6d24f7 100644
--- a/src/mainboard/libretrend/lt1000/Kconfig
+++ b/src/mainboard/libretrend/lt1000/Kconfig
@@ -21,7 +21,6 @@
 	default "LT1000"
 
 config MAINBOARD_DIR
-	string
 	default "libretrend/lt1000"
 
 config MAX_CPUS
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 0bf8ccf..7c8022a 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -21,7 +21,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "lippert/frontrunner-af"
 
 config VARIANT_DIR
diff --git a/src/mainboard/msi/h81m-p33/Kconfig b/src/mainboard/msi/h81m-p33/Kconfig
index de21a55..be64d5d 100644
--- a/src/mainboard/msi/h81m-p33/Kconfig
+++ b/src/mainboard/msi/h81m-p33/Kconfig
@@ -16,7 +16,6 @@
 	select SUPERIO_NUVOTON_NCT6779D
 
 config MAINBOARD_DIR
-	string
 	default "msi/h81m-p33"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/msi/ms7707/Kconfig b/src/mainboard/msi/ms7707/Kconfig
index bc4d657..06a2c4d 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -14,7 +14,6 @@
 	select SERIRQ_CONTINUOUS_MODE
 
 config MAINBOARD_DIR
-	string
 	default "msi/ms7707"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/msi/ms7721/Kconfig b/src/mainboard/msi/ms7721/Kconfig
index a4834ee..bc865d4 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -15,7 +15,6 @@
 	select GFXUMA
 
 config MAINBOARD_DIR
-	string
 	default "msi/ms7721"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig
index 3161495..8181c59 100644
--- a/src/mainboard/ocp/deltalake/Kconfig
+++ b/src/mainboard/ocp/deltalake/Kconfig
@@ -30,7 +30,6 @@
 	default 4
 
 config MAINBOARD_DIR
-	string
 	default "ocp/deltalake"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig
index fd4e36f..ef3cb2a 100644
--- a/src/mainboard/ocp/tiogapass/Kconfig
+++ b/src/mainboard/ocp/tiogapass/Kconfig
@@ -16,7 +16,6 @@
 	select VPD
 
 config MAINBOARD_DIR
-	string
 	default "ocp/tiogapass"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/opencellular/elgon/Kconfig b/src/mainboard/opencellular/elgon/Kconfig
index 06c2a49..673e6bc 100644
--- a/src/mainboard/opencellular/elgon/Kconfig
+++ b/src/mainboard/opencellular/elgon/Kconfig
@@ -27,7 +27,6 @@
 	default "ELGON"
 
 config MAINBOARD_DIR
-	string
 	default "opencellular/elgon"
 
 config DRIVER_TPM_I2C_BUS
diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig
index b499fbb..e113c79 100644
--- a/src/mainboard/packardbell/ms2290/Kconfig
+++ b/src/mainboard/packardbell/ms2290/Kconfig
@@ -15,7 +15,6 @@
 	select EC_ACPI
 
 config MAINBOARD_DIR
-	string
 	default "packardbell/ms2290"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig
index 2c6e657..4e415c8 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -19,7 +19,6 @@
 	select MAINBOARD_HAS_LPC_TPM
 
 config MAINBOARD_DIR
-	string
 	default "pcengines/apu1"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 875c01c..4dfc0da 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -22,7 +22,6 @@
 	select PCIEXP_L1_SUB_STATE
 
 config MAINBOARD_DIR
-	string
 	default "pcengines/apu2"
 
 config VARIANT_DIR
diff --git a/src/mainboard/pine64/rockpro64/Kconfig b/src/mainboard/pine64/rockpro64/Kconfig
index 4e04cc6..4cfa41a 100644
--- a/src/mainboard/pine64/rockpro64/Kconfig
+++ b/src/mainboard/pine64/rockpro64/Kconfig
@@ -11,7 +11,6 @@
 	select SPI_FLASH_GIGADEVICE
 
 config MAINBOARD_DIR
-	string
 	default "pine64/rockpro64"
 
 config BOOT_DEVICE_SPI_FLASH_BUS
diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig
index 4fbe7b8..f01d5fb 100644
--- a/src/mainboard/portwell/m107/Kconfig
+++ b/src/mainboard/portwell/m107/Kconfig
@@ -34,7 +34,6 @@
 endchoice
 
 config MAINBOARD_DIR
-	string
 	default "portwell/m107"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig
index ef42889..507c4e2 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/src/mainboard/prodrive/hermes/Kconfig
@@ -35,7 +35,6 @@
 	default "Hermes CFL"
 
 config MAINBOARD_DIR
-	string
 	default "prodrive/hermes"
 
 config PCIEXP_L1_SUB_STATE
diff --git a/src/mainboard/protectli/vault_bsw/Kconfig b/src/mainboard/protectli/vault_bsw/Kconfig
index 5d576bf..3c6f776 100644
--- a/src/mainboard/protectli/vault_bsw/Kconfig
+++ b/src/mainboard/protectli/vault_bsw/Kconfig
@@ -14,7 +14,6 @@
 	select SUPERIO_ITE_IT8613E
 
 config MAINBOARD_DIR
-	string
 	default "protectli/vault_bsw"
 
 config VARIANT_DIR
diff --git a/src/mainboard/protectli/vault_kbl/Kconfig b/src/mainboard/protectli/vault_kbl/Kconfig
index 9f39549..e69357e 100644
--- a/src/mainboard/protectli/vault_kbl/Kconfig
+++ b/src/mainboard/protectli/vault_kbl/Kconfig
@@ -20,7 +20,6 @@
 	default 18
 
 config MAINBOARD_DIR
-	string
 	default "protectli/vault_kbl"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index 50c6d5b..892d7454 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -34,7 +34,6 @@
 	def_bool n
 
 config MAINBOARD_DIR
-	string
 	default "purism/librem_bdw"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index 58c576c..46cf32f 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -16,7 +16,6 @@
 if BOARD_PURISM_BASEBOARD_LIBREM_CNL
 
 config MAINBOARD_DIR
-	string
 	default "purism/librem_cnl"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig
index 84dc896..c0f9d32 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -40,7 +40,6 @@
 	default "Librem 15 v4" if BOARD_PURISM_LIBREM15_V4
 
 config MAINBOARD_DIR
-	string
 	default "purism/librem_skl"
 
 config OVERRIDE_DEVICETREE
diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig
index 9c7d7fd..9e18c0c 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Kconfig
+++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig
@@ -42,7 +42,6 @@
 	default "1.0"
 
 config MAINBOARD_DIR
-	string
 	default "razer/blade_stealth_kbl"
 
 config MAX_CPUS
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 112d3ad..3397a60 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -21,7 +21,6 @@
 	select BOOT_DEVICE_NOT_SPI_FLASH
 
 config MAINBOARD_DIR
-	string
 	default "roda/rk886ex"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index ef6feeb..21f1754 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -18,7 +18,6 @@
 	select INTEL_INT15
 
 config MAINBOARD_DIR
-	string
 	default "roda/rk9"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index d487119..bb4c0be 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -16,7 +16,6 @@
 	select MAINBOARD_USES_IFD_GBE_REGION
 
 config MAINBOARD_DIR
-	string
 	default "roda/rv11"
 
 config VARIANT_DIR
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 7d73bc7..e58b2d1 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -30,7 +30,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "samsung/lumpy"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 6e69ac8..64a1007 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -25,7 +25,6 @@
 	select VBOOT_VBNV_CMOS
 
 config MAINBOARD_DIR
-	string
 	default "samsung/stumpy"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index 7722f97..55cf5bb 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -16,7 +16,6 @@
 	select NO_UART_ON_SUPERIO
 
 config MAINBOARD_DIR
-	string
 	default "sapphire/pureplatinumh61"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/scaleway/tagada/Kconfig b/src/mainboard/scaleway/tagada/Kconfig
index cbbb6ae..40e5dd0 100644
--- a/src/mainboard/scaleway/tagada/Kconfig
+++ b/src/mainboard/scaleway/tagada/Kconfig
@@ -11,7 +11,6 @@
 	select UART_OVERRIDE_BAUDRATE
 
 config MAINBOARD_DIR
-	string
 	default "scaleway/tagada"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/siemens/chili/Kconfig b/src/mainboard/siemens/chili/Kconfig
index 5c35137..0907e8b 100644
--- a/src/mainboard/siemens/chili/Kconfig
+++ b/src/mainboard/siemens/chili/Kconfig
@@ -34,7 +34,6 @@
 if BOARD_SIEMENS_CHILI_COMMON
 
 config MAINBOARD_DIR
-	string
 	default "siemens/chili"
 
 config MAINBOARD_FAMILY
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index ac85670..2c27bf4 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -12,7 +12,6 @@
 if BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config MAINBOARD_DIR
-	string
 	default "siemens/mc_apl1"
 
 config VARIANT_DIR
diff --git a/src/mainboard/siemens/mc_ehl/Kconfig b/src/mainboard/siemens/mc_ehl/Kconfig
index 035bc85..91ffcbd 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/Kconfig
@@ -12,7 +12,6 @@
 if BOARD_SIEMENS_BASEBOARD_MC_EHL
 
 config MAINBOARD_DIR
-	string
 	default "siemens/mc_ehl"
 
 config VARIANT_DIR
diff --git a/src/mainboard/sifive/hifive-unleashed/Kconfig b/src/mainboard/sifive/hifive-unleashed/Kconfig
index e678fbd..c68ec8e 100644
--- a/src/mainboard/sifive/hifive-unleashed/Kconfig
+++ b/src/mainboard/sifive/hifive-unleashed/Kconfig
@@ -14,7 +14,6 @@
 	default 0x10000
 
 config MAINBOARD_DIR
-	string
 	default "sifive/hifive-unleashed"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/supermicro/x10slm-f/Kconfig b/src/mainboard/supermicro/x10slm-f/Kconfig
index 157d7e2..f7baf08 100644
--- a/src/mainboard/supermicro/x10slm-f/Kconfig
+++ b/src/mainboard/supermicro/x10slm-f/Kconfig
@@ -20,7 +20,6 @@
 	default 0xb00000
 
 config MAINBOARD_DIR
-	string
 	default "supermicro/x10slm-f"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index 51b48ec..fbc7a256 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -29,7 +29,6 @@
 	default "X11SSH-F/LN4F"	if BOARD_SUPERMICRO_X11SSH_F
 
 config MAINBOARD_DIR
-	string
 	default "supermicro/x11-lga1151-series"
 
 config VARIANT_DIR
diff --git a/src/mainboard/supermicro/x9scl/Kconfig b/src/mainboard/supermicro/x9scl/Kconfig
index 96dc657..3bb7e5d 100644
--- a/src/mainboard/supermicro/x9scl/Kconfig
+++ b/src/mainboard/supermicro/x9scl/Kconfig
@@ -16,7 +16,6 @@
 	select IPMI_KCS
 
 config MAINBOARD_DIR
-	string
 	default "supermicro/x9scl"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/system76/gaze15/Kconfig b/src/mainboard/system76/gaze15/Kconfig
index 7d3d9a6..4108c3e 100644
--- a/src/mainboard/system76/gaze15/Kconfig
+++ b/src/mainboard/system76/gaze15/Kconfig
@@ -21,7 +21,6 @@
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "system76/gaze15"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig
index b75a55d..ae6d00e 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -22,7 +22,6 @@
 	select USE_LEGACY_8254_TIMER # Fix failure to boot GRUB
 
 config MAINBOARD_DIR
-	string
 	default "system76/lemp9"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/system76/oryp5/Kconfig b/src/mainboard/system76/oryp5/Kconfig
index dd993f7..65c0a68 100644
--- a/src/mainboard/system76/oryp5/Kconfig
+++ b/src/mainboard/system76/oryp5/Kconfig
@@ -22,7 +22,6 @@
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "system76/oryp5"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/system76/oryp6/Kconfig b/src/mainboard/system76/oryp6/Kconfig
index 1075aeb..921ea7a 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/src/mainboard/system76/oryp6/Kconfig
@@ -22,7 +22,6 @@
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "system76/oryp6"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig
index dd27f22..81e40d3 100644
--- a/src/mainboard/system76/whl-u/Kconfig
+++ b/src/mainboard/system76/whl-u/Kconfig
@@ -22,7 +22,6 @@
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	string
 	default "system76/whl-u"
 
 config VARIANT_DIR
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index d42483a..720c339 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -11,7 +11,6 @@
 	select COMMONLIB_STORAGE_SD
 
 config MAINBOARD_DIR
-	string
 	default "ti/beaglebone"
 
 config MAINBOARD_PART_NUMBER
diff --git a/src/mainboard/up/squared/Kconfig b/src/mainboard/up/squared/Kconfig
index 02be349..3a61cb1 100644
--- a/src/mainboard/up/squared/Kconfig
+++ b/src/mainboard/up/squared/Kconfig
@@ -27,7 +27,6 @@
 	default "UPSQUARED"
 
 config MAINBOARD_DIR
-	string
 	default "up/squared"
 
 config MAINBOARD_VENDOR