summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-07-23 11:01:50 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-07-26 14:04:45 +0000
commit9cddae151af30339790748cc0ff40df47e24f019 (patch)
treeb5bfd37d7ce07d8ea9ee2cf6d51f495ce922d488 /src/mainboard
parentac90f593f8481285c79863017cfa748a0d029686 (diff)
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>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/51nb/x210/Kconfig1
-rw-r--r--src/mainboard/Kconfig3
-rw-r--r--src/mainboard/acer/g43t-am3/Kconfig1
-rw-r--r--src/mainboard/amd/bilby/Kconfig1
-rw-r--r--src/mainboard/amd/gardenia/Kconfig1
-rw-r--r--src/mainboard/amd/inagua/Kconfig1
-rw-r--r--src/mainboard/amd/mandolin/Kconfig1
-rw-r--r--src/mainboard/amd/olivehill/Kconfig1
-rw-r--r--src/mainboard/amd/padmelon/Kconfig1
-rw-r--r--src/mainboard/amd/parmer/Kconfig1
-rw-r--r--src/mainboard/amd/persimmon/Kconfig1
-rw-r--r--src/mainboard/amd/south_station/Kconfig1
-rw-r--r--src/mainboard/amd/thatcher/Kconfig1
-rw-r--r--src/mainboard/amd/union_station/Kconfig1
-rw-r--r--src/mainboard/aopen/dxplplusu/Kconfig1
-rw-r--r--src/mainboard/apple/macbook21/Kconfig1
-rw-r--r--src/mainboard/apple/macbookair4_2/Kconfig1
-rw-r--r--src/mainboard/asrock/b75pro3-m/Kconfig1
-rw-r--r--src/mainboard/asrock/b85m_pro4/Kconfig1
-rw-r--r--src/mainboard/asrock/e350m1/Kconfig1
-rw-r--r--src/mainboard/asrock/g41c-gs/Kconfig1
-rw-r--r--src/mainboard/asrock/h110m/Kconfig1
-rw-r--r--src/mainboard/asrock/h81m-hds/Kconfig1
-rw-r--r--src/mainboard/asrock/imb-a180/Kconfig1
-rw-r--r--src/mainboard/asus/a88xm-e/Kconfig1
-rw-r--r--src/mainboard/asus/am1i-a/Kconfig1
-rw-r--r--src/mainboard/asus/f2a85-m/Kconfig1
-rw-r--r--src/mainboard/asus/h61-series/Kconfig1
-rw-r--r--src/mainboard/asus/maximus_iv_gene-z/Kconfig1
-rw-r--r--src/mainboard/asus/p2b/Kconfig1
-rw-r--r--src/mainboard/asus/p5gc-mx/Kconfig1
-rw-r--r--src/mainboard/asus/p5qc/Kconfig1
-rw-r--r--src/mainboard/asus/p5ql-em/Kconfig1
-rw-r--r--src/mainboard/asus/p5qpl-am/Kconfig1
-rw-r--r--src/mainboard/asus/p8x7x-series/Kconfig1
-rw-r--r--src/mainboard/bap/ode_e20XX/Kconfig1
-rw-r--r--src/mainboard/biostar/a68n_5200/Kconfig1
-rw-r--r--src/mainboard/biostar/am1ml/Kconfig1
-rw-r--r--src/mainboard/biostar/th61-itx/Kconfig1
-rw-r--r--src/mainboard/bostentech/gbyt4/Kconfig1
-rw-r--r--src/mainboard/cavium/cn8100_sff_evb/Kconfig1
-rw-r--r--src/mainboard/clevo/cml-u/Kconfig1
-rw-r--r--src/mainboard/clevo/kbl-u/Kconfig1
-rw-r--r--src/mainboard/compulab/intense_pc/Kconfig1
-rw-r--r--src/mainboard/dell/optiplex_9010/Kconfig1
-rw-r--r--src/mainboard/elmex/pcm205400/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-aarch64/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-armv7/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-i440fx/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-power8/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-q35/Kconfig1
-rw-r--r--src/mainboard/emulation/qemu-riscv/Kconfig1
-rw-r--r--src/mainboard/emulation/spike-riscv/Kconfig1
-rw-r--r--src/mainboard/facebook/fbg1701/Kconfig1
-rw-r--r--src/mainboard/facebook/monolith/Kconfig1
-rw-r--r--src/mainboard/foxconn/d41s/Kconfig1
-rw-r--r--src/mainboard/foxconn/g41s-k/Kconfig1
-rw-r--r--src/mainboard/getac/p470/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga-b75m-d3h/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga-d510ud/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga-g41m-es2l/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ga-h61m-series/Kconfig1
-rw-r--r--src/mainboard/gizmosphere/gizmo/Kconfig1
-rw-r--r--src/mainboard/gizmosphere/gizmo2/Kconfig1
-rw-r--r--src/mainboard/google/asurada/Kconfig1
-rw-r--r--src/mainboard/google/auron/Kconfig1
-rw-r--r--src/mainboard/google/beltino/Kconfig1
-rw-r--r--src/mainboard/google/brya/Kconfig1
-rw-r--r--src/mainboard/google/butterfly/Kconfig1
-rw-r--r--src/mainboard/google/cherry/Kconfig1
-rw-r--r--src/mainboard/google/cyan/Kconfig1
-rw-r--r--src/mainboard/google/daisy/Kconfig1
-rw-r--r--src/mainboard/google/dedede/Kconfig1
-rw-r--r--src/mainboard/google/deltaur/Kconfig1
-rw-r--r--src/mainboard/google/drallion/Kconfig1
-rw-r--r--src/mainboard/google/eve/Kconfig1
-rw-r--r--src/mainboard/google/fizz/Kconfig1
-rw-r--r--src/mainboard/google/foster/Kconfig1
-rw-r--r--src/mainboard/google/gale/Kconfig1
-rw-r--r--src/mainboard/google/glados/Kconfig1
-rw-r--r--src/mainboard/google/gru/Kconfig1
-rw-r--r--src/mainboard/google/guybrush/Kconfig1
-rw-r--r--src/mainboard/google/hatch/Kconfig1
-rw-r--r--src/mainboard/google/herobrine/Kconfig1
-rw-r--r--src/mainboard/google/jecht/Kconfig1
-rw-r--r--src/mainboard/google/kahlee/Kconfig1
-rw-r--r--src/mainboard/google/kukui/Kconfig1
-rw-r--r--src/mainboard/google/link/Kconfig1
-rw-r--r--src/mainboard/google/mancomb/Kconfig1
-rw-r--r--src/mainboard/google/mistral/Kconfig1
-rw-r--r--src/mainboard/google/nyan/Kconfig1
-rw-r--r--src/mainboard/google/nyan_big/Kconfig1
-rw-r--r--src/mainboard/google/nyan_blaze/Kconfig1
-rw-r--r--src/mainboard/google/oak/Kconfig1
-rw-r--r--src/mainboard/google/octopus/Kconfig1
-rw-r--r--src/mainboard/google/parrot/Kconfig1
-rw-r--r--src/mainboard/google/peach_pit/Kconfig1
-rw-r--r--src/mainboard/google/poppy/Kconfig1
-rw-r--r--src/mainboard/google/rambi/Kconfig1
-rw-r--r--src/mainboard/google/reef/Kconfig1
-rw-r--r--src/mainboard/google/sarien/Kconfig1
-rw-r--r--src/mainboard/google/slippy/Kconfig1
-rw-r--r--src/mainboard/google/smaug/Kconfig1
-rw-r--r--src/mainboard/google/storm/Kconfig1
-rw-r--r--src/mainboard/google/stout/Kconfig1
-rw-r--r--src/mainboard/google/trogdor/Kconfig1
-rw-r--r--src/mainboard/google/veyron/Kconfig1
-rw-r--r--src/mainboard/google/veyron_mickey/Kconfig1
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig1
-rw-r--r--src/mainboard/google/volteer/Kconfig1
-rw-r--r--src/mainboard/google/zork/Kconfig1
-rw-r--r--src/mainboard/hp/280_g2/Kconfig1
-rw-r--r--src/mainboard/hp/abm/Kconfig1
-rw-r--r--src/mainboard/hp/compaq_8200_elite_sff/Kconfig1
-rw-r--r--src/mainboard/hp/folio_9480m/Kconfig1
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/Kconfig1
-rw-r--r--src/mainboard/hp/snb_ivb_laptops/Kconfig1
-rw-r--r--src/mainboard/hp/z220_sff_workstation/Kconfig1
-rw-r--r--src/mainboard/ibase/mb899/Kconfig1
-rw-r--r--src/mainboard/intel/adlrvp/Kconfig1
-rw-r--r--src/mainboard/intel/apollolake_rvp/Kconfig1
-rw-r--r--src/mainboard/intel/baskingridge/Kconfig1
-rw-r--r--src/mainboard/intel/cedarisland_crb/Kconfig1
-rw-r--r--src/mainboard/intel/coffeelake_rvp/Kconfig1
-rw-r--r--src/mainboard/intel/d510mo/Kconfig1
-rw-r--r--src/mainboard/intel/d945gclf/Kconfig1
-rw-r--r--src/mainboard/intel/dcp847ske/Kconfig1
-rw-r--r--src/mainboard/intel/dg41wv/Kconfig1
-rw-r--r--src/mainboard/intel/dg43gt/Kconfig1
-rw-r--r--src/mainboard/intel/elkhartlake_crb/Kconfig1
-rw-r--r--src/mainboard/intel/emeraldlake2/Kconfig1
-rw-r--r--src/mainboard/intel/galileo/Kconfig1
-rw-r--r--src/mainboard/intel/glkrvp/Kconfig1
-rw-r--r--src/mainboard/intel/harcuvar/Kconfig1
-rw-r--r--src/mainboard/intel/icelake_rvp/Kconfig1
-rw-r--r--src/mainboard/intel/jasperlake_rvp/Kconfig1
-rw-r--r--src/mainboard/intel/kblrvp/Kconfig1
-rw-r--r--src/mainboard/intel/kunimitsu/Kconfig1
-rw-r--r--src/mainboard/intel/leafhill/Kconfig1
-rw-r--r--src/mainboard/intel/minnow3/Kconfig1
-rw-r--r--src/mainboard/intel/saddlebrook/Kconfig1
-rw-r--r--src/mainboard/intel/shadowmountain/Kconfig1
-rw-r--r--src/mainboard/intel/strago/Kconfig1
-rw-r--r--src/mainboard/intel/tglrvp/Kconfig1
-rw-r--r--src/mainboard/intel/wtm2/Kconfig1
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/Kconfig1
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig1
-rw-r--r--src/mainboard/kontron/bsl6/Kconfig1
-rw-r--r--src/mainboard/kontron/ktqm77/Kconfig1
-rw-r--r--src/mainboard/kontron/mal10/Kconfig1
-rw-r--r--src/mainboard/lenovo/g505s/Kconfig1
-rw-r--r--src/mainboard/lenovo/l520/Kconfig1
-rw-r--r--src/mainboard/lenovo/s230u/Kconfig1
-rw-r--r--src/mainboard/lenovo/t400/Kconfig1
-rw-r--r--src/mainboard/lenovo/t410/Kconfig1
-rw-r--r--src/mainboard/lenovo/t420/Kconfig1
-rw-r--r--src/mainboard/lenovo/t420s/Kconfig1
-rw-r--r--src/mainboard/lenovo/t430/Kconfig1
-rw-r--r--src/mainboard/lenovo/t430s/Kconfig1
-rw-r--r--src/mainboard/lenovo/t440p/Kconfig1
-rw-r--r--src/mainboard/lenovo/t520/Kconfig1
-rw-r--r--src/mainboard/lenovo/t530/Kconfig1
-rw-r--r--src/mainboard/lenovo/t60/Kconfig1
-rw-r--r--src/mainboard/lenovo/thinkcentre_a58/Kconfig1
-rw-r--r--src/mainboard/lenovo/w541/Kconfig1
-rw-r--r--src/mainboard/lenovo/x131e/Kconfig1
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/Kconfig1
-rw-r--r--src/mainboard/lenovo/x200/Kconfig1
-rw-r--r--src/mainboard/lenovo/x201/Kconfig1
-rw-r--r--src/mainboard/lenovo/x220/Kconfig1
-rw-r--r--src/mainboard/lenovo/x230/Kconfig1
-rw-r--r--src/mainboard/lenovo/x60/Kconfig1
-rw-r--r--src/mainboard/libretrend/lt1000/Kconfig1
-rw-r--r--src/mainboard/lippert/frontrunner-af/Kconfig1
-rw-r--r--src/mainboard/msi/h81m-p33/Kconfig1
-rw-r--r--src/mainboard/msi/ms7707/Kconfig1
-rw-r--r--src/mainboard/msi/ms7721/Kconfig1
-rw-r--r--src/mainboard/ocp/deltalake/Kconfig1
-rw-r--r--src/mainboard/ocp/tiogapass/Kconfig1
-rw-r--r--src/mainboard/opencellular/elgon/Kconfig1
-rw-r--r--src/mainboard/packardbell/ms2290/Kconfig1
-rw-r--r--src/mainboard/pcengines/apu1/Kconfig1
-rw-r--r--src/mainboard/pcengines/apu2/Kconfig1
-rw-r--r--src/mainboard/pine64/rockpro64/Kconfig1
-rw-r--r--src/mainboard/portwell/m107/Kconfig1
-rw-r--r--src/mainboard/prodrive/hermes/Kconfig1
-rw-r--r--src/mainboard/protectli/vault_bsw/Kconfig1
-rw-r--r--src/mainboard/protectli/vault_kbl/Kconfig1
-rw-r--r--src/mainboard/purism/librem_bdw/Kconfig1
-rw-r--r--src/mainboard/purism/librem_cnl/Kconfig1
-rw-r--r--src/mainboard/purism/librem_skl/Kconfig1
-rw-r--r--src/mainboard/razer/blade_stealth_kbl/Kconfig1
-rw-r--r--src/mainboard/roda/rk886ex/Kconfig1
-rw-r--r--src/mainboard/roda/rk9/Kconfig1
-rw-r--r--src/mainboard/roda/rv11/Kconfig1
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig1
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig1
-rw-r--r--src/mainboard/sapphire/pureplatinumh61/Kconfig1
-rw-r--r--src/mainboard/scaleway/tagada/Kconfig1
-rw-r--r--src/mainboard/siemens/chili/Kconfig1
-rw-r--r--src/mainboard/siemens/mc_apl1/Kconfig1
-rw-r--r--src/mainboard/siemens/mc_ehl/Kconfig1
-rw-r--r--src/mainboard/sifive/hifive-unleashed/Kconfig1
-rw-r--r--src/mainboard/supermicro/x10slm-f/Kconfig1
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/Kconfig1
-rw-r--r--src/mainboard/supermicro/x9scl/Kconfig1
-rw-r--r--src/mainboard/system76/gaze15/Kconfig1
-rw-r--r--src/mainboard/system76/lemp9/Kconfig1
-rw-r--r--src/mainboard/system76/oryp5/Kconfig1
-rw-r--r--src/mainboard/system76/oryp6/Kconfig1
-rw-r--r--src/mainboard/system76/whl-u/Kconfig1
-rw-r--r--src/mainboard/ti/beaglebone/Kconfig1
-rw-r--r--src/mainboard/up/squared/Kconfig1
214 files changed, 3 insertions, 213 deletions
diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig
index efd21da26e..52d7c4ecef 100644
--- a/src/mainboard/51nb/x210/Kconfig
+++ b/src/mainboard/51nb/x210/Kconfig
@@ -25,7 +25,6 @@ config MAINBOARD_VERSION
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 af685db17a..37f8119dfc 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -10,6 +10,9 @@ endchoice
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 941070ed2d..440dd06e35 100644
--- a/src/mainboard/acer/g43t-am3/Kconfig
+++ b/src/mainboard/acer/g43t-am3/Kconfig
@@ -25,7 +25,6 @@ config VGA_BIOS_ID
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 7b74de3446..15b4fc256a 100644
--- a/src/mainboard/amd/bilby/Kconfig
+++ b/src/mainboard/amd/bilby/Kconfig
@@ -48,7 +48,6 @@ config CBFS_SIZE
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 94c098b6a2..148d5f766d 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5cca387b29..2f2e7988cc 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 c592548c7d..2096d2a259 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -51,7 +51,6 @@ config CBFS_SIZE
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 e56200b8bd..5bf02d8fee 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 b286665813..461ec6dfd0 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 ce2f95d008..77490927ea 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 ae68fceac0..c5db4e5c7c 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5a0ac8b013..1a644d93d4 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 95dc8f0632..f91ff9e1e6 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 a92b47b832..bca43841fe 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
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 4ee9b73bdd..ba1c315605 100644
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5d8f6267d1..dc9e95f366 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 0f129a8e23..9d3ecfe2b5 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 6abfa6cf82..9f749a8675 100644
--- a/src/mainboard/asrock/b75pro3-m/Kconfig
+++ b/src/mainboard/asrock/b75pro3-m/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 f33bf34b6c..85c721962c 100644
--- a/src/mainboard/asrock/b85m_pro4/Kconfig
+++ b/src/mainboard/asrock/b85m_pro4/Kconfig
@@ -22,7 +22,6 @@ config CBFS_SIZE
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 3616d2de0b..10c8e1b739 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 6dfe4aa0a9..afc0946ba4 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS
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 cec5db8413..18ac11883b 100644
--- a/src/mainboard/asrock/h110m/Kconfig
+++ b/src/mainboard/asrock/h110m/Kconfig
@@ -22,7 +22,6 @@ config IRQ_SLOT_COUNT
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 4741f2861e..cb80556d0a 100644
--- a/src/mainboard/asrock/h81m-hds/Kconfig
+++ b/src/mainboard/asrock/h81m-hds/Kconfig
@@ -24,7 +24,6 @@ config CBFS_SIZE
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 9879b81fd0..92695839ad 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 17fbe28cd5..5a17545778 100644
--- a/src/mainboard/asus/a88xm-e/Kconfig
+++ b/src/mainboard/asus/a88xm-e/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 365043c1f7..89f57739df 100644
--- a/src/mainboard/asus/am1i-a/Kconfig
+++ b/src/mainboard/asus/am1i-a/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 6a5726366f..3597b40fc8 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -42,7 +42,6 @@ config BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL
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 aed784a2ba..c17f3f9acc 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -15,7 +15,6 @@ config BOARD_ASUS_H61_SERIES
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 6234365f8d..01082db0e3 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig
+++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 ab0a8191af..b6ccca870a 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -26,7 +26,6 @@ config MAX_CPUS
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 ff3bbca46e..0e9aa30a00 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 defe15ed16..414a8f1fc0 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e68b92e3ff..81b5fa01ba 100644
--- a/src/mainboard/asus/p5ql-em/Kconfig
+++ b/src/mainboard/asus/p5ql-em/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 cfa4c59aa9..9cc9a40b44 100644
--- a/src/mainboard/asus/p5qpl-am/Kconfig
+++ b/src/mainboard/asus/p5qpl-am/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
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 bc246e7d8d..95097ccb5e 100644
--- a/src/mainboard/asus/p8x7x-series/Kconfig
+++ b/src/mainboard/asus/p8x7x-series/Kconfig
@@ -16,7 +16,6 @@ config BOARD_ASUS_P8X7X_SERIES
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 7e9e583f9a..bd18bfe101 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 14c7e6d3dd..8f36e92531 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig
+++ b/src/mainboard/biostar/a68n_5200/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e550bfc0bf..e6b6f1aaa6 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 2719853449..4cccf7fa51 100644
--- a/src/mainboard/biostar/th61-itx/Kconfig
+++ b/src/mainboard/biostar/th61-itx/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 a26784062a..d30bbc38ab 100644
--- a/src/mainboard/bostentech/gbyt4/Kconfig
+++ b/src/mainboard/bostentech/gbyt4/Kconfig
@@ -10,7 +10,6 @@ config BOARD_SPECIFIC_OPTIONS
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 721149ecf4..e5005d5c5a 100644
--- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig
+++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig
@@ -13,7 +13,6 @@ config BOARD_SPECIFIC_OPTIONS
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 f594e4e6ae..3696706c98 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -26,7 +26,6 @@ config BOARD_CLEVO_L140CU_BASE
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 9ef3f88111..1bdcbb6258 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -32,7 +32,6 @@ config VBOOT
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 5ea49370aa..273841009d 100644
--- a/src/mainboard/compulab/intense_pc/Kconfig
+++ b/src/mainboard/compulab/intense_pc/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 1f505b0195..a35fa7bdb5 100644
--- a/src/mainboard/dell/optiplex_9010/Kconfig
+++ b/src/mainboard/dell/optiplex_9010/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e9c2ac401f..ffd5bb17c5 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig
+++ b/src/mainboard/elmex/pcm205400/Kconfig
@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS
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 06a7ea82a0..e8cc2621e5 100644
--- a/src/mainboard/emulation/qemu-aarch64/Kconfig
+++ b/src/mainboard/emulation/qemu-aarch64/Kconfig
@@ -27,7 +27,6 @@ config MEMLAYOUT_LD_FILE
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 a91299873a..75fefe4a39 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -29,7 +29,6 @@ config MEMLAYOUT_LD_FILE
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 19f0fca5ab..3b13fa7230 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -52,7 +52,6 @@ config VBOOT_VBNV_OFFSET
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 5dbea721d1..0999eb81ed 100644
--- a/src/mainboard/emulation/qemu-power8/Kconfig
+++ b/src/mainboard/emulation/qemu-power8/Kconfig
@@ -22,7 +22,6 @@ config MEMLAYOUT_LD_FILE
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 c3b6ea6c54..8684b542d6 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -53,7 +53,6 @@ config VBOOT_VBNV_OFFSET
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 ee0f337f6d..4b86ce8291 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -35,7 +35,6 @@ config MEMLAYOUT_LD_FILE
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 3c1ae122e0..df79c293e6 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig
+++ b/src/mainboard/emulation/spike-riscv/Kconfig
@@ -16,7 +16,6 @@ config MEMLAYOUT_LD_FILE
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 742641655e..6db8c194cb 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -54,7 +54,6 @@ config ONBOARD_SAMSUNG_MEM
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 d592f60d90..434f87a27b 100644
--- a/src/mainboard/facebook/monolith/Kconfig
+++ b/src/mainboard/facebook/monolith/Kconfig
@@ -21,7 +21,6 @@ config IRQ_SLOT_COUNT
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 e0aed55cf0..6e82c624f7 100644
--- a/src/mainboard/foxconn/d41s/Kconfig
+++ b/src/mainboard/foxconn/d41s/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 7a69655ea6..f8add62806 100644
--- a/src/mainboard/foxconn/g41s-k/Kconfig
+++ b/src/mainboard/foxconn/g41s-k/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 55a364629e..d9864b0010 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS
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 9a8bf5bc90..1bb61cf828 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
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 6edbe01c0f..4db6622604 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -26,7 +26,6 @@ config USBDEBUG_HCD_INDEX
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 71fe981d7d..03627ac3d5 100644
--- a/src/mainboard/gigabyte/ga-d510ud/Kconfig
+++ b/src/mainboard/gigabyte/ga-d510ud/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 8fbc8cc45b..205838b711 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 cfbed99962..d7d759ea1c 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5bf296e371..713fd05928 100644
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 9337290d3e..82faaa654d 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 89510080c5..1e33e4c16d 100644
--- a/src/mainboard/google/asurada/Kconfig
+++ b/src/mainboard/google/asurada/Kconfig
@@ -33,7 +33,6 @@ config BOARD_SPECIFIC_OPTIONS
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 45e4e3afb4..8e8851a8f3 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -25,7 +25,6 @@ config VBOOT
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 9cd71a852f..80c044448e 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -20,7 +20,6 @@ config VBOOT
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 ec833f573a..4a635a3f8e 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -62,7 +62,6 @@ config OVERRIDE_DEVICETREE
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 2bcff1ca2f..ea231c9afd 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -26,7 +26,6 @@ config VBOOT
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 09b21d2ab0..b1533ce20f 100644
--- a/src/mainboard/google/cherry/Kconfig
+++ b/src/mainboard/google/cherry/Kconfig
@@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5511d0ae71..9c6e5d8f87 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -33,7 +33,6 @@ config DISPLAY_SPD_DATA
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 659e3303aa..55ac2d270c 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -22,7 +22,6 @@ config VBOOT
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 81f28fc30e..34fb0e02a8 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -82,7 +82,6 @@ config FMDFILE
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 c861aec5f2..aecf11d75f 100644
--- a/src/mainboard/google/deltaur/Kconfig
+++ b/src/mainboard/google/deltaur/Kconfig
@@ -57,7 +57,6 @@ config POWER_OFF_ON_CR50_UPDATE
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 9499a60608..bc404304ca 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -61,7 +61,6 @@ config POWER_OFF_ON_CR50_UPDATE
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 af5f8cd0fe..523c84de3f 100644
--- a/src/mainboard/google/eve/Kconfig
+++ b/src/mainboard/google/eve/Kconfig
@@ -51,7 +51,6 @@ config IRQ_SLOT_COUNT
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 afa8f90031..f419823e01 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -45,7 +45,6 @@ config DRIVER_TPM_SPI_BUS
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 61c445c4e1..c33c6ca70f 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -18,7 +18,6 @@ config VBOOT
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 214a18e128..87ecbbde8d 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -27,7 +27,6 @@ config BOARD_VARIANT_DK01
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 bd4e649fbe..6aba540246 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -34,7 +34,6 @@ config IRQ_SLOT_COUNT
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 cf226b4268..551b9a45a4 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -53,7 +53,6 @@ config VBOOT
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 b57fc62a72..e42e9e9e8b 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -69,7 +69,6 @@ config FMDFILE
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 cde7c3782b..2a099c7766 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -105,7 +105,6 @@ config POWER_OFF_ON_CR50_UPDATE
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 38bb328753..ef4e7a3a66 100644
--- a/src/mainboard/google/herobrine/Kconfig
+++ b/src/mainboard/google/herobrine/Kconfig
@@ -28,7 +28,6 @@ config VBOOT
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 dac8f3bc81..771925bdde 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -18,7 +18,6 @@ config VBOOT
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 8cf0ff4901..73d728b5a9 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -38,7 +38,6 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
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 97b6fed552..2ac99d5320 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -39,7 +39,6 @@ config BOARD_SPECIFIC_OPTIONS
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 427e99de9c..5cee6c137c 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -26,7 +26,6 @@ config VBOOT
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 de17454ee9..7b4c5d709f 100644
--- a/src/mainboard/google/mancomb/Kconfig
+++ b/src/mainboard/google/mancomb/Kconfig
@@ -51,7 +51,6 @@ config FMDFILE
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 b7d0d312a2..fafa0114ff 100644
--- a/src/mainboard/google/mistral/Kconfig
+++ b/src/mainboard/google/mistral/Kconfig
@@ -21,7 +21,6 @@ config VBOOT
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 56ec39806e..cfb13dda5f 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -21,7 +21,6 @@ config VBOOT
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 7c65595150..41ef4844be 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -23,7 +23,6 @@ config VBOOT
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 59f7912c13..daae1c8b70 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -23,7 +23,6 @@ config VBOOT
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 7f0d8b5d3f..4ef6337170 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -26,7 +26,6 @@ config VBOOT
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 611aa35d81..396717984d 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -49,7 +49,6 @@ config CHROMEOS
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 164717cce2..e94e29aee1 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -27,7 +27,6 @@ config VBOOT
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 e3da4b98e3..657fe4932b 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -20,7 +20,6 @@ config VBOOT
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 134246c173..2c0540b532 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -85,7 +85,6 @@ config INCLUDE_NHLT_BLOBS_RAMMUS
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 4748d45d83..0b05485577 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -24,7 +24,6 @@ config VBOOT
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 9744d74738..9b8f4220d1 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -46,7 +46,6 @@ config VBOOT
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 144e244d1d..1a382daeb1 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -57,7 +57,6 @@ config POWER_OFF_ON_CR50_UPDATE
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 c9ca334a8d..5890da27a6 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -27,7 +27,6 @@ config VBOOT
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 ef619c4182..d1e408f6b2 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -25,7 +25,6 @@ config VBOOT
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 e17109c702..de391ea42a 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -25,7 +25,6 @@ config BOARD_VARIANT_AP148
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 d4d99f5e78..59a88495cb 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -25,7 +25,6 @@ config VBOOT
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 e29fd9f19d..a8ba53ef19 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -44,7 +44,6 @@ config VBOOT
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 00094cd17a..82f44b2123 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -33,7 +33,6 @@ config VBOOT
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 b958c06474..4cd626b301 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -18,7 +18,6 @@ config VBOOT
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 b5f6b2d266..7c86ca59c0 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -18,7 +18,6 @@ config VBOOT
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 74ff92d9f5..67b6c7cfb6 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -81,7 +81,6 @@ config DRIVER_TPM_I2C_ADDR
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 aff1898343..b0edf30600 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -62,7 +62,6 @@ config FMDFILE
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 10f6828ca7..e76fef6c50 100644
--- a/src/mainboard/hp/280_g2/Kconfig
+++ b/src/mainboard/hp/280_g2/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 495254bab9..5ea2992099 100644
--- a/src/mainboard/hp/abm/Kconfig
+++ b/src/mainboard/hp/abm/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 038a32ea85..61c3a6c871 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -23,7 +23,6 @@ config CBFS_SIZE
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 545a67bae9..7b55eb09a3 100644
--- a/src/mainboard/hp/folio_9480m/Kconfig
+++ b/src/mainboard/hp/folio_9480m/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
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 02623620d6..f50ccbf5f9 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 812c630b13..0fcbb0df42 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -17,7 +17,6 @@ config BOARD_HP_SNB_IVB_LAPTOPS
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 935547f1ab..3c4df0018f 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig
@@ -36,7 +36,6 @@ config CBFS_SIZE
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 66d85f396b..4088465db5 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
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 8510c3831f..5e49ea9212 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -32,7 +32,6 @@ config CHROMEOS
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 dfd86eb3ea..45a8556b1f 100644
--- a/src/mainboard/intel/apollolake_rvp/Kconfig
+++ b/src/mainboard/intel/apollolake_rvp/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS
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 b2d06539da..ab3e5e86ad 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -16,7 +16,6 @@ config VBOOT
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 417931e23d..76135b415e 100644
--- a/src/mainboard/intel/cedarisland_crb/Kconfig
+++ b/src/mainboard/intel/cedarisland_crb/Kconfig
@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e4c2d90a95..132d17645b 100644
--- a/src/mainboard/intel/coffeelake_rvp/Kconfig
+++ b/src/mainboard/intel/coffeelake_rvp/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
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 6e7552cb53..49b988fa74 100644
--- a/src/mainboard/intel/d510mo/Kconfig
+++ b/src/mainboard/intel/d510mo/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 06e1a0cfbf..00844e304b 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS
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 13e176ac9a..70443df31e 100644
--- a/src/mainboard/intel/dcp847ske/Kconfig
+++ b/src/mainboard/intel/dcp847ske/Kconfig
@@ -26,7 +26,6 @@ config DISABLE_UART_ON_TESTPADS
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 b90f263b3c..60708b7fb7 100644
--- a/src/mainboard/intel/dg41wv/Kconfig
+++ b/src/mainboard/intel/dg41wv/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 2e7b81e570..bad84872e2 100644
--- a/src/mainboard/intel/dg43gt/Kconfig
+++ b/src/mainboard/intel/dg43gt/Kconfig
@@ -26,7 +26,6 @@ config VGA_BIOS_ID
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 ed1a4c1683..9f1f9103d6 100644
--- a/src/mainboard/intel/elkhartlake_crb/Kconfig
+++ b/src/mainboard/intel/elkhartlake_crb/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 c37da039fc..10519e3c44 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -18,7 +18,6 @@ config VBOOT
#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 37db0c66f2..e4a6bb590f 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
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 7fda90d98a..b3d5d840a9 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -46,7 +46,6 @@ config VBOOT
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 05a8d2d405..f383775a7e 100644
--- a/src/mainboard/intel/harcuvar/Kconfig
+++ b/src/mainboard/intel/harcuvar/Kconfig
@@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS
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 69559edcea..6cac590fac 100644
--- a/src/mainboard/intel/icelake_rvp/Kconfig
+++ b/src/mainboard/intel/icelake_rvp/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 26c96aa74d..1112f6b7df 100644
--- a/src/mainboard/intel/jasperlake_rvp/Kconfig
+++ b/src/mainboard/intel/jasperlake_rvp/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 fcce402d85..1e4a8453c7 100644
--- a/src/mainboard/intel/kblrvp/Kconfig
+++ b/src/mainboard/intel/kblrvp/Kconfig
@@ -25,7 +25,6 @@ config IRQ_SLOT_COUNT
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 cf67ca18d0..3e37fde112 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -30,7 +30,6 @@ config IRQ_SLOT_COUNT
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 652a6597b1..83dd53940e 100644
--- a/src/mainboard/intel/leafhill/Kconfig
+++ b/src/mainboard/intel/leafhill/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS
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 0c86df6870..f33a1826f2 100644
--- a/src/mainboard/intel/minnow3/Kconfig
+++ b/src/mainboard/intel/minnow3/Kconfig
@@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e7aaae50c8..b1b44c645b 100644
--- a/src/mainboard/intel/saddlebrook/Kconfig
+++ b/src/mainboard/intel/saddlebrook/Kconfig
@@ -21,7 +21,6 @@ config IRQ_SLOT_COUNT
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 94a279f37b..fedd6b7cfc 100644
--- a/src/mainboard/intel/shadowmountain/Kconfig
+++ b/src/mainboard/intel/shadowmountain/Kconfig
@@ -47,7 +47,6 @@ config DEVICETREE
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 1db86dc27e..9574262e74 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -23,7 +23,6 @@ config VBOOT
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 4dc2d56aa2..efd8f019e7 100644
--- a/src/mainboard/intel/tglrvp/Kconfig
+++ b/src/mainboard/intel/tglrvp/Kconfig
@@ -33,7 +33,6 @@ config CHROMEOS
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 6312220266..4b1fabecbc 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -15,7 +15,6 @@ config VBOOT
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 2e28784818..2076308d64 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 1a527d6178..a490d5b042 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 1592d55c4b..2fbe4133bd 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -29,7 +29,6 @@ config BOARD_KONTRON_BOXER26_OPTIONS
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 52798bff49..4ca8ecf33a 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 8a4cf6d1b4..51238a5ab1 100644
--- a/src/mainboard/kontron/mal10/Kconfig
+++ b/src/mainboard/kontron/mal10/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 e6278afbec..17de81b241 100644
--- a/src/mainboard/lenovo/g505s/Kconfig
+++ b/src/mainboard/lenovo/g505s/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 33879cd56b..1900f05a50 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 fde744ff4d..83e3e13567 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 a7e3922531..ae3eb2a154 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -47,7 +47,6 @@ config FMDFILE
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 804043da56..97803273fd 100644
--- a/src/mainboard/lenovo/t410/Kconfig
+++ b/src/mainboard/lenovo/t410/Kconfig
@@ -47,7 +47,6 @@ config FMDFILE
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 578a652620..f0ae362426 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -48,7 +48,6 @@ config FMDFILE
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 3616a8da24..5e9e051146 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -47,7 +47,6 @@ config FMDFILE
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 287e5f6233..d5a1582c7e 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -46,7 +46,6 @@ config FMDFILE
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 6f1568d16c..dfbcfc4603 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -49,7 +49,6 @@ config FMDFILE
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 b84576de5e..7fb62ae732 100644
--- a/src/mainboard/lenovo/t440p/Kconfig
+++ b/src/mainboard/lenovo/t440p/Kconfig
@@ -43,7 +43,6 @@ config FMDFILE
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 077bec2a1b..325189e10b 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -48,7 +48,6 @@ config VARIANT_DIR
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 17e248d40f..2f50ef533a 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -53,7 +53,6 @@ config VARIANT_DIR
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 e4246b4f19..af167b6216 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS
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 419f012373..ad9a32b53d 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/Kconfig
+++ b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 efa3a12a99..e6f53bab0d 100644
--- a/src/mainboard/lenovo/w541/Kconfig
+++ b/src/mainboard/lenovo/w541/Kconfig
@@ -26,7 +26,6 @@ config GFX_GMA_PANEL_1_PORT
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 4508e5e4a1..e7f262a938 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -41,7 +41,6 @@ config FMDFILE
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 0bec670a2b..3a00c412b9 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -47,7 +47,6 @@ config FMDFILE
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 bd259361e4..0f90a27e70 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -43,7 +43,6 @@ config FMDFILE
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 e920816fe5..4fff82bb21 100644
--- a/src/mainboard/lenovo/x201/Kconfig
+++ b/src/mainboard/lenovo/x201/Kconfig
@@ -43,7 +43,6 @@ config FMDFILE
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 9845089fd2..f07aa4216b 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -42,7 +42,6 @@ config VBOOT_VBNV_OFFSET
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 a6fdd7b14e..9e2020e088 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -49,7 +49,6 @@ config FMDFILE
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 3a8217932d..6f7aebd564 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -44,7 +44,6 @@ config FMDFILE
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 2610e8b988..f6d24f70af 100644
--- a/src/mainboard/libretrend/lt1000/Kconfig
+++ b/src/mainboard/libretrend/lt1000/Kconfig
@@ -21,7 +21,6 @@ config MAINBOARD_PART_NUMBER
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 0bf8ccf896..7c8022a7a2 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 de21a55a78..be64d5d73d 100644
--- a/src/mainboard/msi/h81m-p33/Kconfig
+++ b/src/mainboard/msi/h81m-p33/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 bc4d657222..06a2c4d8ae 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
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 a4834ee327..bc865d48d5 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 316149567e..8181c591c3 100644
--- a/src/mainboard/ocp/deltalake/Kconfig
+++ b/src/mainboard/ocp/deltalake/Kconfig
@@ -30,7 +30,6 @@ config IPMI_KCS_REGISTER_SPACING
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 fd4e36f75f..ef3cb2afeb 100644
--- a/src/mainboard/ocp/tiogapass/Kconfig
+++ b/src/mainboard/ocp/tiogapass/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 06c2a49413..673e6bcf89 100644
--- a/src/mainboard/opencellular/elgon/Kconfig
+++ b/src/mainboard/opencellular/elgon/Kconfig
@@ -27,7 +27,6 @@ config GBB_HWID
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 b499fbb1db..e113c79d40 100644
--- a/src/mainboard/packardbell/ms2290/Kconfig
+++ b/src/mainboard/packardbell/ms2290/Kconfig
@@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
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 2c6e657db6..4e415c8306 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS
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 875c01c837..4dfc0daf59 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 4e04cc68d6..4cfa41a97d 100644
--- a/src/mainboard/pine64/rockpro64/Kconfig
+++ b/src/mainboard/pine64/rockpro64/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS
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 4fbe7b8832..f01d5fba60 100644
--- a/src/mainboard/portwell/m107/Kconfig
+++ b/src/mainboard/portwell/m107/Kconfig
@@ -34,7 +34,6 @@ config ONBOARD_MEM_KINGSTON
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 ef42889594..507c4e2819 100644
--- a/src/mainboard/prodrive/hermes/Kconfig
+++ b/src/mainboard/prodrive/hermes/Kconfig
@@ -35,7 +35,6 @@ config MAINBOARD_PART_NUMBER
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 5d576bf042..3c6f77661b 100644
--- a/src/mainboard/protectli/vault_bsw/Kconfig
+++ b/src/mainboard/protectli/vault_bsw/Kconfig
@@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
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 9f39549891..e69357e6d4 100644
--- a/src/mainboard/protectli/vault_kbl/Kconfig
+++ b/src/mainboard/protectli/vault_kbl/Kconfig
@@ -20,7 +20,6 @@ config IRQ_SLOT_COUNT
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 50c6d5be6a..892d7454c2 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -34,7 +34,6 @@ config PCIEXP_AER
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 58c576c301..46cf32f276 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -16,7 +16,6 @@ config BOARD_PURISM_BASEBOARD_LIBREM_CNL
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 84dc8967dd..c0f9d32f99 100644
--- a/src/mainboard/purism/librem_skl/Kconfig
+++ b/src/mainboard/purism/librem_skl/Kconfig
@@ -40,7 +40,6 @@ config MAINBOARD_PART_NUMBER
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 9c7d7fde50..9e18c0c58d 100644
--- a/src/mainboard/razer/blade_stealth_kbl/Kconfig
+++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig
@@ -42,7 +42,6 @@ config MAINBOARD_VERSION
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 112d3ada61..3397a60c80 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 ef6feebce6..21f1754bc3 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS
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 d4871191ed..bb4c0be265 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 7d73bc7b99..e58b2d16a6 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -30,7 +30,6 @@ config VBOOT
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 6e69ac8a01..64a1007580 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -25,7 +25,6 @@ config VBOOT
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 7722f9761a..55cf5bb089 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 cbbb6ae668..40e5dd0453 100644
--- a/src/mainboard/scaleway/tagada/Kconfig
+++ b/src/mainboard/scaleway/tagada/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS
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 5c351379b4..0907e8b4ea 100644
--- a/src/mainboard/siemens/chili/Kconfig
+++ b/src/mainboard/siemens/chili/Kconfig
@@ -34,7 +34,6 @@ config BOARD_SIEMENS_CHILI_CHILI_OPTIONS
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 ac85670644..2c27bf4c07 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -12,7 +12,6 @@ source "src/mainboard/siemens/mc_apl1/variants/*/Kconfig"
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 035bc8584d..91ffcbd691 100644
--- a/src/mainboard/siemens/mc_ehl/Kconfig
+++ b/src/mainboard/siemens/mc_ehl/Kconfig
@@ -12,7 +12,6 @@ source "src/mainboard/siemens/mc_ehl/variants/*/Kconfig"
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 e678fbdf62..c68ec8eb8c 100644
--- a/src/mainboard/sifive/hifive-unleashed/Kconfig
+++ b/src/mainboard/sifive/hifive-unleashed/Kconfig
@@ -14,7 +14,6 @@ config HEAP_SIZE
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 157d7e21fd..f7baf08cee 100644
--- a/src/mainboard/supermicro/x10slm-f/Kconfig
+++ b/src/mainboard/supermicro/x10slm-f/Kconfig
@@ -20,7 +20,6 @@ config CBFS_SIZE
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 51b48ecf35..fbc7a2566f 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -29,7 +29,6 @@ config MAINBOARD_PART_NUMBER
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 96dc6575a4..3bb7e5d1c8 100644
--- a/src/mainboard/supermicro/x9scl/Kconfig
+++ b/src/mainboard/supermicro/x9scl/Kconfig
@@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
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 7d3d9a60f0..4108c3eeb0 100644
--- a/src/mainboard/system76/gaze15/Kconfig
+++ b/src/mainboard/system76/gaze15/Kconfig
@@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
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 b75a55d19e..ae6d00e557 100644
--- a/src/mainboard/system76/lemp9/Kconfig
+++ b/src/mainboard/system76/lemp9/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 dd993f7eac..65c0a684c8 100644
--- a/src/mainboard/system76/oryp5/Kconfig
+++ b/src/mainboard/system76/oryp5/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 1075aeb7e8..921ea7a1a2 100644
--- a/src/mainboard/system76/oryp6/Kconfig
+++ b/src/mainboard/system76/oryp6/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 dd27f22dcf..81e40d3d55 100644
--- a/src/mainboard/system76/whl-u/Kconfig
+++ b/src/mainboard/system76/whl-u/Kconfig
@@ -22,7 +22,6 @@ config BOARD_SPECIFIC_OPTIONS
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 d42483a1af..720c339628 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS
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 02be349915..3a61cb1c56 100644
--- a/src/mainboard/up/squared/Kconfig
+++ b/src/mainboard/up/squared/Kconfig
@@ -27,7 +27,6 @@ config GBB_HWID
default "UPSQUARED"
config MAINBOARD_DIR
- string
default "up/squared"
config MAINBOARD_VENDOR