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>
2021-07-23 11:01:50 +02:00 · 2021-07-23 11:01:50 +02:00 · 9cddae151a
parent ac90f593f8
commit 9cddae151a
214 changed files with 3 additions and 213 deletions
--- 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
--- 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"

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"


--- 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
--- 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
--- 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
--- 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
--- 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"

 ##########################################################
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More