summaryrefslogtreecommitdiffstats
path: root/src
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
parentac90f593f8481285c79863017cfa748a0d029686 (diff)
downloadcoreboot-9cddae151af30339790748cc0ff40df47e24f019.tar.gz
coreboot-9cddae151af30339790748cc0ff40df47e24f019.tar.bz2
coreboot-9cddae151af30339790748cc0ff40df47e24f019.zip
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')
-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 efd21da26e19..52d7c4ecefb2 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 af685db17a00..37f8119dfcf1 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 941070ed2dfc..440dd06e3535 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 7b74de3446fd..15b4fc256a88 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 94c098b6a20b..148d5f766dc4 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 5cca387b29bc..2f2e7988cc95 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 c592548c7d26..2096d2a25910 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 e56200b8bd6b..5bf02d8feee5 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 b28666581308..461ec6dfd033 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 ce2f95d0083d..77490927eab3 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 ae68fceac080..c5db4e5c7cd5 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 5a0ac8b01314..1a644d93d43e 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 95dc8f0632fd..f91ff9e1e62e 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 a92b47b83286..bca43841fe14 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 4ee9b73bdd5b..ba1c31560544 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 5d8f6267d161..dc9e95f366e3 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 0f129a8e2310..9d3ecfe2b5ca 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 6abfa6cf82ef..9f749a867545 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 f33bf34b6c42..85c721962c4a 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 3616d2de0b62..10c8e1b739c3 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 6dfe4aa0a906..afc0946ba449 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 cec5db841359..18ac11883bb3 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 4741f2861e27..cb80556d0acd 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 9879b81fd044..92695839ad6f 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 17fbe28cd5a1..5a17545778dd 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 365043c1f7f7..89f57739dfc2 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 6a5726366f78..3597b40fc82f 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 aed784a2ba9a..c17f3f9acc8e 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 6234365f8ddf..01082db0e370 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 ab0a8191af3a..b6ccca870ad6 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 ff3bbca46e52..0e9aa30a0044 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 defe15ed167d..414a8f1fc0f7 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 e68b92e3ffeb..81b5fa01ba2f 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 cfa4c59aa9b1..9cc9a40b4420 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 bc246e7d8d65..95097ccb5e93 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 7e9e583f9af8..bd18bfe1011c 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 14c7e6d3dd22..8f36e92531e9 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 e550bfc0bf37..e6b6f1aaa628 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 2719853449b6..4cccf7fa51aa 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 a26784062aad..d30bbc38abde 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 721149ecf452..e5005d5c5a57 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 f594e4e6ae09..3696706c9830 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 9ef3f8811146..1bdcbb62588d 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 5ea49370aa3d..273841009dde 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 1f505b0195ed..a35fa7bdb587 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 e9c2ac401f9b..ffd5bb17c5ce 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 06a7ea82a0ec..e8cc2621e5ca 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 a91299873a9d..75fefe4a39f4 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 19f0fca5abe9..3b13fa7230e2 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 5dbea721d18b..0999eb81ed9e 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 c3b6ea6c54ae..8684b542d615 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 ee0f337f6d3a..4b86ce8291ca 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 3c1ae122e077..df79c293e67c 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 742641655e76..6db8c194cbb4 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 d592f60d9085..434f87a27b43 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 e0aed55cf00a..6e82c624f796 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 7a69655ea6da..f8add62806d2 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 55a364629eea..d9864b0010db 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 9a8bf5bc9025..1bb61cf8284d 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 6edbe01c0fb1..4db6622604b7 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 71fe981d7d90..03627ac3d598 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 8fbc8cc45bf6..205838b7114f 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 cfbed99962e7..d7d759ea1c7a 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 5bf296e371ec..713fd0592825 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 9337290d3e2f..82faaa654d7e 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 89510080c569..1e33e4c16ded 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 45e4e3afb4d6..8e8851a8f385 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 9cd71a852f80..80c044448eb7 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 ec833f573a76..4a635a3f8e7d 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 2bcff1ca2f31..ea231c9afdda 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 09b21d2ab03f..b1533ce20f2e 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 5511d0ae717c..9c6e5d8f8798 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 659e3303aaf5..55ac2d270c3e 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 81f28fc30e99..34fb0e02a818 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 c861aec5f2e3..aecf11d75f0d 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 9499a6060826..bc404304ca11 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 af5f8cd0fec0..523c84de3f0c 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 afa8f9003170..f419823e0156 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 61c445c4e136..c33c6ca70fda 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 214a18e128db..87ecbbde8dd8 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 bd4e649fbed0..6aba54024668 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 cf226b42684b..551b9a45a4ab 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 b57fc62a72f9..e42e9e9e8b37 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 cde7c3782bb3..2a099c776682 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 38bb3287534a..ef4e7a3a6623 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 dac8f3bc8160..771925bddebf 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 8cf0ff4901b2..73d728b5a9d7 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 97b6fed5524e..2ac99d532078 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 427e99de9c64..5cee6c137c76 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 de17454ee96c..7b4c5d709f6b 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 b7d0d312a29a..fafa0114ffc1 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 56ec39806ed0..cfb13dda5f88 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 7c6559515082..41ef4844be37 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 59f7912c138b..daae1c8b7093 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 7f0d8b5d3ff3..4ef63371700b 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 611aa35d81e3..396717984dbe 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 164717cce22f..e94e29aee19a 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 e3da4b98e3ac..657fe4932bbd 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 134246c173e0..2c0540b5327f 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 4748d45d83c4..0b0548557732 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 9744d747388f..9b8f4220d1c3 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 144e244d1d33..1a382daeb114 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 c9ca334a8d2a..5890da27a69e 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 ef619c4182f1..d1e408f6b24c 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 e17109c70283..de391ea42a9b 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 d4d99f5e78e3..59a88495cb66 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 e29fd9f19d90..a8ba53ef19f6 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 00094cd17a89..82f44b2123b6 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 b958c064744f..4cd626b3012e 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 b5f6b2d266fa..7c86ca59c01e 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 74ff92d9f5f6..67b6c7cfb691 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 aff18983431d..b0edf30600ef 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 10f6828ca7cd..e76fef6c5012 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 495254bab9f3..5ea29920990a 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 038a32ea8522..61c3a6c871e8 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 545a67bae963..7b55eb09a334 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 02623620d633..f50ccbf5f97d 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 812c630b13ae..0fcbb0df42cb 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 935547f1ab7b..3c4df0018f06 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 66d85f396b9f..4088465db5fb 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 8510c3831feb..5e49ea9212fc 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 dfd86eb3ea35..45a8556b1ff7 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 b2d06539da4a..ab3e5e86ad8b 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 417931e23d14..76135b415e0f 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 e4c2d90a9564..132d17645b9c 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 6e7552cb5318..49b988fa74b5 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 06e1a0cfbff8..00844e304b8f 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 13e176ac9a12..70443df31e65 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 b90f263b3c26..60708b7fb72d 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 2e7b81e5709d..bad84872e26a 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 ed1a4c1683e1..9f1f9103d64f 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 c37da039fcbd..10519e3c4415 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 37db0c66f2b2..e4a6bb590f71 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 7fda90d98a43..b3d5d840a92f 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 05a8d2d405d4..f383775a7e26 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 69559edcea3f..6cac590fac34 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 26c96aa74dba..1112f6b7df22 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 fcce402d8572..1e4a8453c7b0 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 cf67ca18d0e5..3e37fde11200 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 652a6597b168..83dd53940eea 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 0c86df687064..f33a1826f229 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 e7aaae50c8ae..b1b44c645b6f 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 94a279f37b49..fedd6b7cfcea 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 1db86dc27e58..9574262e7468 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 4dc2d56aa27f..efd8f019e708 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 631222026697..4b1fabecbc25 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 2e28784818b2..2076308d6484 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 1a527d6178a5..a490d5b042a1 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 1592d55c4b2c..2fbe4133bd25 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 52798bff4926..4ca8ecf33a3b 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 8a4cf6d1b4b4..51238a5ab1e8 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 e6278afbec51..17de81b24120 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 33879cd56b46..1900f05a5064 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 fde744ff4d67..83e3e135670f 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 a7e3922531de..ae3eb2a1544f 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 804043da568e..97803273fdd7 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 578a65262053..f0ae3624260a 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 3616a8da24c8..5e9e0511464b 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 287e5f62335f..d5a1582c7e82 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 6f1568d16cd6..dfbcfc4603b2 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 b84576de5efe..7fb62ae73264 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 077bec2a1b7d..325189e10b73 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 17e248d40f9f..2f50ef533a3a 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 e4246b4f1926..af167b621685 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 419f01237392..ad9a32b53df8 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 efa3a12a99a8..e6f53bab0dce 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 4508e5e4a181..e7f262a9386d 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 0bec670a2b44..3a00c412b9ad 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 bd259361e4f9..0f90a27e70fa 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 e920816fe5d7..4fff82bb216a 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 9845089fd222..f07aa4216b32 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 a6fdd7b14e19..9e2020e08825 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 3a8217932df3..6f7aebd5640b 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 2610e8b98850..f6d24f70af04 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 0bf8ccf89663..7c8022a7a200 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 de21a55a78bc..be64d5d73d4b 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 bc4d657222e2..06a2c4d8aee0 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 a4834ee327ec..bc865d48d57a 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 316149567ebb..8181c591c3d5 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 fd4e36f75f39..ef3cb2afeb4c 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 06c2a4941374..673e6bcf8906 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 b499fbb1db10..e113c79d4068 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 2c6e657db632..4e415c8306cf 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 875c01c8375e..4dfc0daf5946 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 4e04cc68d657..4cfa41a97da9 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 4fbe7b8832fb..f01d5fba60cf 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 ef4288959438..507c4e281969 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 5d576bf042e1..3c6f77661bf4 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 9f3954989135..e69357e6d40f 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 50c6d5be6af3..892d7454c28f 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 58c576c30137..46cf32f276ba 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 84dc8967ddba..c0f9d32f991c 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 9c7d7fde50d4..9e18c0c58d86 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 112d3ada6186..3397a60c80fb 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 ef6feebce6ea..21f1754bc335 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 d4871191ed82..bb4c0be265f6 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 7d73bc7b992e..e58b2d16a6cb 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 6e69ac8a01ef..64a10075808c 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 7722f9761a1e..55cf5bb089fa 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 cbbb6ae66801..40e5dd0453ce 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 5c351379b4dc..0907e8b4ea77 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 ac85670644ad..2c27bf4c07dd 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 035bc8584daf..91ffcbd691ee 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 e678fbdf62e6..c68ec8eb8c1b 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 157d7e21fdc8..f7baf08cee13 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 51b48ecf35f7..fbc7a2566ff6 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 96dc6575a45f..3bb7e5d1c839 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 7d3d9a60f0af..4108c3eeb0dc 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 b75a55d19e6a..ae6d00e557d4 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 dd993f7eac53..65c0a684c8d1 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 1075aeb7e825..921ea7a1a252 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 dd27f22dcf70..81e40d3d5562 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 d42483a1afa1..720c3396287f 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 02be3499154a..3a61cb1c5601 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