Kconfig: comply to Linux 5.3's Kconfig language rules

Kconfig became stricter on what it accepts, so accomodate before
updating to a new release.

Change-Id: I92a9e9bf0d557a7532ba533cd7776c48f2488f91
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37156
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

168 files changed, 204 insertions, 206 deletions

diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig
index a91288bca7..d132c7e848 100644
--- a/payloads/external/LinuxBoot/Kconfig
+++ b/payloads/external/LinuxBoot/Kconfig
@@ -117,7 +117,6 @@ config LINUXBOOT_KERNEL_ARCH_DEFAULT_CONFIG
 
 config LINUXBOOT_KERNEL_CUSTOM_CONFIG
 	bool "Custom (def)config file"
-	help
 
 endchoice
 
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 47c333bf6a..1eed2de4d0 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -18,8 +18,8 @@ config ARCH_RAMSTAGE_ARM
 	bool
 	select ARCH_ARM
 
-source src/arch/arm/armv4/Kconfig
-source src/arch/arm/armv7/Kconfig
+source "src/arch/arm/armv4/Kconfig"
+source "src/arch/arm/armv7/Kconfig"
 
 config ARM_LPAE
 	bool
diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig
index 3d1d1843e0..96a23dc41b 100644
--- a/src/arch/arm64/Kconfig
+++ b/src/arch/arm64/Kconfig
@@ -18,7 +18,7 @@ config ARCH_RAMSTAGE_ARM64
 	bool
 	select ARCH_ARM64
 
-source src/arch/arm64/armv8/Kconfig
+source "src/arch/arm64/armv8/Kconfig"
 
 if ARCH_ARM64
 
diff --git a/src/console/Kconfig b/src/console/Kconfig
index e767edd4fd..b90823ecd0 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -88,7 +88,7 @@ comment "Serial port base address = 0x2e8"
 depends on DRIVERS_UART_8250IO && UART_FOR_CONSOLE = 3
 
 config UART_OVERRIDE_BAUDRATE
-	boolean
+	bool
 	help
 	  Set to "y" when the platform overrides the baudrate by providing
 	  a get_uart_baudrate routine.
@@ -303,7 +303,7 @@ config SPI_CONSOLE
 	  drivers are written.
 
 config CONSOLE_OVERRIDE_LOGLEVEL
-	boolean
+	bool
 	help
 	  Set to "y" when the platform overrides the loglevel by providing
 	  a get_console_loglevel routine.
diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig
index 4ade0f678e..db8989de19 100644
--- a/src/cpu/amd/Kconfig
+++ b/src/cpu/amd/Kconfig
@@ -1,2 +1,2 @@
-source src/cpu/amd/agesa/Kconfig
-source src/cpu/amd/pi/Kconfig
+source "src/cpu/amd/agesa/Kconfig"
+source "src/cpu/amd/pi/Kconfig"
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index b6b757f6ae..ddfe707d79 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -66,6 +66,6 @@ config S3_DATA_SIZE
 
 endif # CPU_AMD_AGESA
 
-source src/cpu/amd/agesa/family14/Kconfig
-source src/cpu/amd/agesa/family15tn/Kconfig
-source src/cpu/amd/agesa/family16kb/Kconfig
+source "src/cpu/amd/agesa/family14/Kconfig"
+source "src/cpu/amd/agesa/family15tn/Kconfig"
+source "src/cpu/amd/agesa/family16kb/Kconfig"
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
index b33302ecef..ee6fa4bb5c 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -61,6 +61,6 @@ config S3_DATA_SIZE
 
 endif # CPU_AMD_PI
 
-source src/cpu/amd/pi/00630F01/Kconfig
-source src/cpu/amd/pi/00730F01/Kconfig
-source src/cpu/amd/pi/00660F01/Kconfig
+source "src/cpu/amd/pi/00630F01/Kconfig"
+source "src/cpu/amd/pi/00730F01/Kconfig"
+source "src/cpu/amd/pi/00660F01/Kconfig"
diff --git a/src/cpu/armltd/Kconfig b/src/cpu/armltd/Kconfig
index af0c5c531c..db1af75f33 100644
--- a/src/cpu/armltd/Kconfig
+++ b/src/cpu/armltd/Kconfig
@@ -1 +1 @@
-source src/cpu/armltd/cortex-a9/Kconfig
+source "src/cpu/armltd/cortex-a9/Kconfig"
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index c21de59ba2..43b360bfc4 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -1,31 +1,31 @@
 # CPU models
-source src/cpu/intel/model_6xx/Kconfig
-source src/cpu/intel/model_65x/Kconfig
-source src/cpu/intel/model_67x/Kconfig
-source src/cpu/intel/model_68x/Kconfig
-source src/cpu/intel/model_6bx/Kconfig
-source src/cpu/intel/model_6ex/Kconfig
-source src/cpu/intel/model_6fx/Kconfig
-source src/cpu/intel/model_1067x/Kconfig
-source src/cpu/intel/model_106cx/Kconfig
-source src/cpu/intel/model_206ax/Kconfig
-source src/cpu/intel/model_2065x/Kconfig
-source src/cpu/intel/model_f2x/Kconfig
-source src/cpu/intel/model_f3x/Kconfig
-source src/cpu/intel/model_f4x/Kconfig
-source src/cpu/intel/haswell/Kconfig
+source "src/cpu/intel/model_6xx/Kconfig"
+source "src/cpu/intel/model_65x/Kconfig"
+source "src/cpu/intel/model_67x/Kconfig"
+source "src/cpu/intel/model_68x/Kconfig"
+source "src/cpu/intel/model_6bx/Kconfig"
+source "src/cpu/intel/model_6ex/Kconfig"
+source "src/cpu/intel/model_6fx/Kconfig"
+source "src/cpu/intel/model_1067x/Kconfig"
+source "src/cpu/intel/model_106cx/Kconfig"
+source "src/cpu/intel/model_206ax/Kconfig"
+source "src/cpu/intel/model_2065x/Kconfig"
+source "src/cpu/intel/model_f2x/Kconfig"
+source "src/cpu/intel/model_f3x/Kconfig"
+source "src/cpu/intel/model_f4x/Kconfig"
+source "src/cpu/intel/haswell/Kconfig"
 # Sockets/Slots
-source src/cpu/intel/slot_1/Kconfig
-source src/cpu/intel/socket_BGA956/Kconfig
-source src/cpu/intel/socket_FCBGA559/Kconfig
-source src/cpu/intel/socket_m/Kconfig
-source src/cpu/intel/socket_p/Kconfig
-source src/cpu/intel/socket_mPGA604/Kconfig
-source src/cpu/intel/socket_441/Kconfig
-source src/cpu/intel/socket_LGA775/Kconfig
+source "src/cpu/intel/slot_1/Kconfig"
+source "src/cpu/intel/socket_BGA956/Kconfig"
+source "src/cpu/intel/socket_FCBGA559/Kconfig"
+source "src/cpu/intel/socket_m/Kconfig"
+source "src/cpu/intel/socket_p/Kconfig"
+source "src/cpu/intel/socket_mPGA604/Kconfig"
+source "src/cpu/intel/socket_441/Kconfig"
+source "src/cpu/intel/socket_LGA775/Kconfig"
 # Architecture specific features
-source src/cpu/intel/fit/Kconfig
-source src/cpu/intel/turbo/Kconfig
-source src/cpu/intel/common/Kconfig
-source src/cpu/intel/microcode/Kconfig
-source src/cpu/intel/car/non-evict/Kconfig
+source "src/cpu/intel/fit/Kconfig"
+source "src/cpu/intel/turbo/Kconfig"
+source "src/cpu/intel/common/Kconfig"
+source "src/cpu/intel/microcode/Kconfig"
+source "src/cpu/intel/car/non-evict/Kconfig"
diff --git a/src/cpu/ti/Kconfig b/src/cpu/ti/Kconfig
index 5a62219dcf..119e84bfc1 100644
--- a/src/cpu/ti/Kconfig
+++ b/src/cpu/ti/Kconfig
@@ -1 +1 @@
-source src/cpu/ti/am335x/Kconfig
+source "src/cpu/ti/am335x/Kconfig"
diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig
index 1f23a195f3..41b870fbf7 100644
--- a/src/drivers/uart/Kconfig
+++ b/src/drivers/uart/Kconfig
@@ -20,14 +20,14 @@ config NO_UART_ON_SUPERIO
 	def_bool n
 
 config UART_OVERRIDE_INPUT_CLOCK_DIVIDER
-	boolean
+	bool
 	default n
 	help
 	  Set to "y" when the platform overrides the uart_input_clock_divider
 	  routine.
 
 config UART_OVERRIDE_REFCLK
-	boolean
+	bool
 	default n
 	help
 	  Set to "y" when the platform overrides the uart_platform_refclk
diff --git a/src/mainboard/amd/bettong/Kconfig b/src/mainboard/amd/bettong/Kconfig
index eaebfb5e8f..5f26e8777e 100644
--- a/src/mainboard/amd/bettong/Kconfig
+++ b/src/mainboard/amd/bettong/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/bettong
+	default "amd/bettong"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/db-ft3b-lc/Kconfig b/src/mainboard/amd/db-ft3b-lc/Kconfig
index ffb3f1043f..256b5553bf 100644
--- a/src/mainboard/amd/db-ft3b-lc/Kconfig
+++ b/src/mainboard/amd/db-ft3b-lc/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/db-ft3b-lc
+	default "amd/db-ft3b-lc"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/gardenia/Kconfig b/src/mainboard/amd/gardenia/Kconfig
index 7adc678b69..02e3e95953 100644
--- a/src/mainboard/amd/gardenia/Kconfig
+++ b/src/mainboard/amd/gardenia/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/gardenia
+	default "amd/gardenia"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 6d6ec4fc83..e24af4044a 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/inagua
+	default "amd/inagua"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/lamar/Kconfig b/src/mainboard/amd/lamar/Kconfig
index 210b3c2836..025e5ffa80 100644
--- a/src/mainboard/amd/lamar/Kconfig
+++ b/src/mainboard/amd/lamar/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/lamar
+	default "amd/lamar"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index 066d967ff4..bd9a2fee81 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/olivehill
+	default "amd/olivehill"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index 5779aaf3c6..96d934702e 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/olivehillplus
+	default "amd/olivehillplus"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/padmelon/Kconfig b/src/mainboard/amd/padmelon/Kconfig
index 3d8efb1165..e4dd90c8b3 100644
--- a/src/mainboard/amd/padmelon/Kconfig
+++ b/src/mainboard/amd/padmelon/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 
 config MAINBOARD_DIR
 	string
-	default amd/padmelon
+	default "amd/padmelon"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index 506f9acd57..6d989b63ff 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/parmer
+	default "amd/parmer"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 4a4d274476..41bf3c9c2e 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/persimmon
+	default "amd/persimmon"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 6f1d1b41cd..a059403c7b 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/south_station
+	default "amd/south_station"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index 7791a1d630..a957d4c965 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/thatcher
+	default "amd/thatcher"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 4f2cdddda6..72881b8d4c 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default amd/union_station
+	default "amd/union_station"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig
index 738a2ea0ae..0036915392 100644
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default aopen/dxplplusu
+	default "aopen/dxplplusu"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index 84c00cfa9c..93e2d8d9b4 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default apple/macbook21
+	default "apple/macbook21"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index df8ecfd79d..771f327aa0 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default apple/macbookair4_2
+	default "apple/macbookair4_2"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asrock/b75pro3-m/Kconfig b/src/mainboard/asrock/b75pro3-m/Kconfig
index 878eaad098..561bea5006 100644
--- a/src/mainboard/asrock/b75pro3-m/Kconfig
+++ b/src/mainboard/asrock/b75pro3-m/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asrock/b75pro3-m
+	default "asrock/b75pro3-m"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index cc380e5166..3bbc2a5150 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asrock/e350m1
+	default "asrock/e350m1"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asrock/h81m-hds/Kconfig b/src/mainboard/asrock/h81m-hds/Kconfig
index 6974cda95f..7088cbbbe6 100644
--- a/src/mainboard/asrock/h81m-hds/Kconfig
+++ b/src/mainboard/asrock/h81m-hds/Kconfig
@@ -41,7 +41,7 @@ config CBFS_SIZE
 
 config MAINBOARD_DIR
 	string
-	default asrock/h81m-hds
+	default "asrock/h81m-hds"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index 3dae526794..2391202cff 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asrock/imb-a180
+	default "asrock/imb-a180"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/am1i-a/Kconfig b/src/mainboard/asus/am1i-a/Kconfig
index d50edbec27..0aafd8ba64 100644
--- a/src/mainboard/asus/am1i-a/Kconfig
+++ b/src/mainboard/asus/am1i-a/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/am1i-a
+	default "asus/am1i-a"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index 100b33cd7a..c1dd063c77 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -57,7 +57,7 @@ config BOARD_ASUS_F2A85_M_DDR3_VOLT_VAL
 
 config MAINBOARD_DIR
 	string
-	default asus/f2a85-m
+	default "asus/f2a85-m"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/h61m-cs/Kconfig b/src/mainboard/asus/h61m-cs/Kconfig
index 69efa9da81..6040208f27 100644
--- a/src/mainboard/asus/h61m-cs/Kconfig
+++ b/src/mainboard/asus/h61m-cs/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/h61m-cs
+	default "asus/h61m-cs"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
index a0bc31864e..be832ce044 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig
+++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
@@ -36,7 +36,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/maximus_iv_gene-z
+	default "asus/maximus_iv_gene-z"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index e1fc2215e4..8db9b7ad43 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p2b-d
+	default "asus/p2b-d"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index b3c4b2dc16..8b55174f41 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p2b-ds
+	default "asus/p2b-ds"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index f0ab38d0ed..efe625c5d2 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p2b-f
+	default "asus/p2b-f"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index c39dc79bf8..60124fe750 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -27,7 +27,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p2b-ls
+	default "asus/p2b-ls"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index f34b4ddfa6..65e7681485 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p2b
+	default "asus/p2b"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index e09adf19a9..179fed29c3 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p3b-f
+	default "asus/p3b-f"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig
index 193364ab72..a0e60146a0 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p5gc-mx
+	default "asus/p5gc-mx"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig
index 010641ac66..2210b1a59e 100644
--- a/src/mainboard/asus/p8h61-m_lx/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx/Kconfig
@@ -37,7 +37,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p8h61-m_lx
+	default "asus/p8h61-m_lx"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig
index e8a6f6404a..0c8988e0c8 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -37,7 +37,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default asus/p8h61-m_pro
+	default "asus/p8h61-m_pro"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig
index 0c37d5f390..1d526399f1 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default bap/ode_e20XX
+	default "bap/ode_e20XX"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/bap/ode_e21XX/Kconfig b/src/mainboard/bap/ode_e21XX/Kconfig
index 3bdb573386..bf812f26ea 100644
--- a/src/mainboard/bap/ode_e21XX/Kconfig
+++ b/src/mainboard/bap/ode_e21XX/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default bap/ode_e21XX
+	default "bap/ode_e21XX"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/biostar/a68n_5200/Kconfig b/src/mainboard/biostar/a68n_5200/Kconfig
index f5f23382e1..e4271d34fe 100644
--- a/src/mainboard/biostar/a68n_5200/Kconfig
+++ b/src/mainboard/biostar/a68n_5200/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default biostar/a68n_5200
+	default "biostar/a68n_5200"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/biostar/am1ml/Kconfig b/src/mainboard/biostar/am1ml/Kconfig
index a981787a60..31aa5f061b 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default biostar/am1ml
+	default "biostar/am1ml"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig
index 3326b74bf6..68a01f18bc 100644
--- a/src/mainboard/compulab/intense_pc/Kconfig
+++ b/src/mainboard/compulab/intense_pc/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default compulab/intense_pc
+	default "compulab/intense_pc"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/elmex/pcm205400/Kconfig b/src/mainboard/elmex/pcm205400/Kconfig
index 850361ad90..7dc67d17ea 100644
--- a/src/mainboard/elmex/pcm205400/Kconfig
+++ b/src/mainboard/elmex/pcm205400/Kconfig
@@ -43,7 +43,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default elmex/pcm205400
+	default "elmex/pcm205400"
 
 config HW_MEM_HOLE_SIZEK
 	hex
diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig
index ebdbf16e8c..895446ddd7 100644
--- a/src/mainboard/emulation/qemu-aarch64/Kconfig
+++ b/src/mainboard/emulation/qemu-aarch64/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-aarch64
+	default "emulation/qemu-aarch64"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 73b2d5dede..181f9a45a9 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -39,7 +39,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-armv7
+	default "emulation/qemu-armv7"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 8632ef67c2..3c27b1e963 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -42,7 +42,7 @@ config VBOOT_VBNV_OFFSET
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-i440fx
+	default "emulation/qemu-i440fx"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 8b97495180..3a9bb6f04e 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -41,7 +41,7 @@ config VBOOT_VBNV_OFFSET
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-q35
+	default "emulation/qemu-q35"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig b/src/mainboard/emulation/qemu-riscv/Kconfig
index fa6dccc94c..4d4c900138 100644
--- a/src/mainboard/emulation/qemu-riscv/Kconfig
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig
@@ -44,7 +44,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default emulation/qemu-riscv
+	default "emulation/qemu-riscv"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig
index 03046f723f..2fe0e1798f 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig
+++ b/src/mainboard/emulation/spike-riscv/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default emulation/spike-riscv
+	default "emulation/spike-riscv"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/emulation/spike-riscv/Kconfig.name b/src/mainboard/emulation/spike-riscv/Kconfig.name
index 17549c6ebb..0c0205dce6 100644
--- a/src/mainboard/emulation/spike-riscv/Kconfig.name
+++ b/src/mainboard/emulation/spike-riscv/Kconfig.name
@@ -1,3 +1,2 @@
 config BOARD_EMULATION_SPIKE_RISCV
 	bool "SPIKE riscv"
-	help
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index c92626b7fa..dc8dc26c81 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -42,7 +42,7 @@ config ONBOARD_SAMSUNG_MEM
 
 config MAINBOARD_DIR
 	string
-	default facebook/fbg1701
+	default "facebook/fbg1701"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/foxconn/d41s/Kconfig b/src/mainboard/foxconn/d41s/Kconfig
index 56ab34f8fd..4805fe0fd4 100644
--- a/src/mainboard/foxconn/d41s/Kconfig
+++ b/src/mainboard/foxconn/d41s/Kconfig
@@ -37,7 +37,7 @@ config MAX_CPUS
 
 config MAINBOARD_DIR
 	string
-	default foxconn/d41s
+	default "foxconn/d41s"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index f1c7d4550d..7394ea4c14 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -36,7 +36,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default getac/p470
+	default "getac/p470"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index e9ed54d828..3c373a767b 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default gigabyte/ga-945gcm-s2l
+	default "gigabyte/ga-945gcm-s2l"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index ceb2dbc85f..64d9cc526e 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -28,7 +28,7 @@ config USBDEBUG_HCD_INDEX
 
 config MAINBOARD_DIR
 	string
-	default gigabyte/ga-b75m-d3h
+	default "gigabyte/ga-b75m-d3h"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index 51f7fa0d5d..e195e8f0a2 100644
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -31,7 +31,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default gizmosphere/gizmo
+	default "gizmosphere/gizmo"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index 94158baa7a..034b6eeaf3 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default gizmosphere/gizmo2
+	default "gizmosphere/gizmo2"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index b4ef3a83ac..b64b47eb70 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -27,7 +27,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/auron
+	default "google/auron"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index 9de141f539..4b18c8cfea 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -20,7 +20,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/beltino
+	default "google/beltino"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 76bcc3d3b0..92fc236f9b 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -26,7 +26,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/butterfly
+	default "google/butterfly"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/cheza/Kconfig b/src/mainboard/google/cheza/Kconfig
index ce69fe07e7..30218ccb44 100644
--- a/src/mainboard/google/cheza/Kconfig
+++ b/src/mainboard/google/cheza/Kconfig
@@ -25,7 +25,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/cheza
+	default "google/cheza"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 647d4e9026..bb5ffb692a 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -34,7 +34,7 @@ config DISPLAY_SPD_DATA
 
 config MAINBOARD_DIR
 	string
-	default google/cyan
+	default "google/cyan"
 
 config MAINBOARD_FAMILY
 	string
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index ec09d5e199..f15bd9b864 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -36,7 +36,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/daisy
+	default "google/daisy"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 6157519434..eefc2c085b 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -32,7 +32,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/foster
+	default "google/foster"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/gale/Kconfig b/src/mainboard/google/gale/Kconfig
index 5e00be0ef4..81aaabf452 100644
--- a/src/mainboard/google/gale/Kconfig
+++ b/src/mainboard/google/gale/Kconfig
@@ -41,7 +41,7 @@ config BOARD_VARIANT_DK01
 
 config MAINBOARD_DIR
 	string
-	default google/gale
+	default "google/gale"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig
index e7db1858db..72003e0d06 100644
--- a/src/mainboard/google/gru/Kconfig
+++ b/src/mainboard/google/gru/Kconfig
@@ -67,7 +67,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/gru
+	default "google/gru"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 041ffcebc8..41727c56a7 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -20,7 +20,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/jecht
+	default "google/jecht"
 
 
 config VARIANT_DIR
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index a83b07a6b7..8632553256 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -50,7 +50,7 @@ if BOARD_GOOGLE_BASEBOARD_KAHLEE
 
 config MAINBOARD_DIR
 	string
-	default google/kahlee
+	default "google/kahlee"
 
 config VGA_BIOS_FILE
 	string
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index c5c7a86d7e..098ce494ab 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -46,7 +46,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default google/kukui
+	default "google/kukui"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 12c5ffeb38..4a32ac2055 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -26,7 +26,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/link
+	default "google/link"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/mistral/Kconfig b/src/mainboard/google/mistral/Kconfig
index d6f9b169a3..88e67097ba 100644
--- a/src/mainboard/google/mistral/Kconfig
+++ b/src/mainboard/google/mistral/Kconfig
@@ -22,7 +22,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/mistral
+	default "google/mistral"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 5ad945e12d..c6175452c2 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -35,7 +35,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/nyan
+	default "google/nyan"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index bef25577a9..f02f694d55 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -37,7 +37,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/nyan_big
+	default "google/nyan_big"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index cb001538c9..8de957d9f2 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -37,7 +37,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/nyan_blaze
+	default "google/nyan_blaze"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig
index f943a4f437..264f3711e3 100644
--- a/src/mainboard/google/oak/Kconfig
+++ b/src/mainboard/google/oak/Kconfig
@@ -50,7 +50,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/oak
+	default "google/oak"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index d712600158..1177cd50f6 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -48,7 +48,7 @@ config CHROMEOS
 
 config MAINBOARD_DIR
 	string
-	default google/octopus
+	default "google/octopus"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index daf605d436..0169beaf3f 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -27,7 +27,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/parrot
+	default "google/parrot"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index fc2ceb83ad..b0b4d233bb 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -34,7 +34,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/peach_pit
+	default "google/peach_pit"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 83bcc1a2ee..fc6e28e519 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -23,7 +23,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/rambi
+	default "google/rambi"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 520b78819f..5d782b1cef 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -48,7 +48,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/reef
+	default "google/reef"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 13dbe19577..94ade7a546 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -28,7 +28,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/slippy
+	default "google/slippy"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 2b9be0262a..fa08251b24 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -38,7 +38,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/smaug
+	default "google/smaug"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 3abea56c86..0bd8f5aad1 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -39,7 +39,7 @@ config BOARD_VARIANT_AP148
 
 config MAINBOARD_DIR
 	string
-	default google/storm
+	default "google/storm"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index dfe687b0ff..a77964b8f8 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -25,7 +25,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/stout
+	default "google/stout"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index 56b3a729c2..fba6b17667 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -25,7 +25,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/trogdor
+	default "google/trogdor"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 8e29661929..5d1e616911 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -47,7 +47,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/veyron
+	default "google/veyron"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 876d70ea2b..5d15f0ec77 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -32,7 +32,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/veyron_mickey
+	default "google/veyron_mickey"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 4550c5b822..ac6f382054 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -32,7 +32,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default google/veyron_rialto
+	default "google/veyron_rialto"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig
index 5e33aac2c2..a014b0cfc4 100644
--- a/src/mainboard/hp/2570p/Kconfig
+++ b/src/mainboard/hp/2570p/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/2570p
+	default "hp/2570p"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig
index ab298369e1..935064c15d 100644
--- a/src/mainboard/hp/2760p/Kconfig
+++ b/src/mainboard/hp/2760p/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/2760p
+	default "hp/2760p"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig
index ca97cd69f6..08e21fdd20 100644
--- a/src/mainboard/hp/8460p/Kconfig
+++ b/src/mainboard/hp/8460p/Kconfig
@@ -38,7 +38,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/8460p
+	default "hp/8460p"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig
index 5b30208b64..e084d00baa 100644
--- a/src/mainboard/hp/8470p/Kconfig
+++ b/src/mainboard/hp/8470p/Kconfig
@@ -36,7 +36,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/8470p
+	default "hp/8470p"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/8770w/Kconfig b/src/mainboard/hp/8770w/Kconfig
index 41e2ed3c6b..80f9199afc 100644
--- a/src/mainboard/hp/8770w/Kconfig
+++ b/src/mainboard/hp/8770w/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/8770w
+	default "hp/8770w"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/abm/Kconfig b/src/mainboard/hp/abm/Kconfig
index 43cf67f2a6..5ba1b5b857 100644
--- a/src/mainboard/hp/abm/Kconfig
+++ b/src/mainboard/hp/abm/Kconfig
@@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/abm
+	default "hp/abm"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index cbfb0ed387..42efd4a925 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/compaq_8200_elite_sff
+	default "hp/compaq_8200_elite_sff"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig
index d9bb68e7e1..8759192954 100644
--- a/src/mainboard/hp/folio_9470m/Kconfig
+++ b/src/mainboard/hp/folio_9470m/Kconfig
@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/folio_9470m
+	default "hp/folio_9470m"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
index 7fa04ee46d..3c67e2ad07 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/pavilion_m6_1035dx
+	default "hp/pavilion_m6_1035dx"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig
index ce7364ce5e..26e645fb90 100644
--- a/src/mainboard/hp/revolve_810_g1/Kconfig
+++ b/src/mainboard/hp/revolve_810_g1/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default hp/revolve_810_g1
+	default "hp/revolve_810_g1"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_sff_workstation/Kconfig
index 4598de2040..649cbb136b 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig
@@ -32,7 +32,7 @@ config VBOOT_VBNV_OFFSET
 
 config MAINBOARD_DIR
 	string
-	default hp/z220_sff_workstation
+	default "hp/z220_sff_workstation"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index fcc2e38751..d93121dc2d 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default ibase/mb899
+	default "ibase/mb899"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/apollolake_rvp/Kconfig b/src/mainboard/intel/apollolake_rvp/Kconfig
index ed7d77f211..391ce1f494 100644
--- a/src/mainboard/intel/apollolake_rvp/Kconfig
+++ b/src/mainboard/intel/apollolake_rvp/Kconfig
@@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/apollolake_rvp
+	default "intel/apollolake_rvp"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index d5dafa0616..8268891186 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -18,7 +18,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default intel/baskingridge
+	default "intel/baskingridge"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/d510mo/Kconfig b/src/mainboard/intel/d510mo/Kconfig
index 153c1131a9..003e009733 100644
--- a/src/mainboard/intel/d510mo/Kconfig
+++ b/src/mainboard/intel/d510mo/Kconfig
@@ -36,7 +36,7 @@ config MAX_CPUS
 
 config MAINBOARD_DIR
 	string
-	default intel/d510mo
+	default "intel/d510mo"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 46d82ec5f7..683ea2de06 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/d945gclf
+	default "intel/d945gclf"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig
index b1c7bab07d..9bf9e52e0c 100644
--- a/src/mainboard/intel/dcp847ske/Kconfig
+++ b/src/mainboard/intel/dcp847ske/Kconfig
@@ -27,7 +27,7 @@ endmenu
 
 config MAINBOARD_DIR
 	string
-	default intel/dcp847ske
+	default "intel/dcp847ske"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 61dd1b0f3d..c37da039fc 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -19,7 +19,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default intel/emeraldlake2
+	default "intel/emeraldlake2"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig
index 84f09c4f82..2e855da87a 100644
--- a/src/mainboard/intel/galileo/Kconfig
+++ b/src/mainboard/intel/galileo/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/galileo
+	default "intel/galileo"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig
index ebb5a3a07b..8ed2afff3a 100644
--- a/src/mainboard/intel/glkrvp/Kconfig
+++ b/src/mainboard/intel/glkrvp/Kconfig
@@ -50,7 +50,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default intel/glkrvp
+	default "intel/glkrvp"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/intel/harcuvar/Kconfig b/src/mainboard/intel/harcuvar/Kconfig
index 9d43b11e07..e3cd86e8f7 100644
--- a/src/mainboard/intel/harcuvar/Kconfig
+++ b/src/mainboard/intel/harcuvar/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/harcuvar
+	default "intel/harcuvar"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig
index e89d892631..5832570b54 100644
--- a/src/mainboard/intel/leafhill/Kconfig
+++ b/src/mainboard/intel/leafhill/Kconfig
@@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/leafhill
+	default "intel/leafhill"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig
index 2dea6b40cc..8d95a35d8d 100644
--- a/src/mainboard/intel/minnow3/Kconfig
+++ b/src/mainboard/intel/minnow3/Kconfig
@@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default intel/minnow3
+	default "intel/minnow3"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 5a49e8cc0a..246add1895 100644
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -24,7 +24,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default intel/strago
+	default "intel/strago"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index 27545fec05..2f6b21e9ce 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -19,7 +19,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default intel/wtm2
+	default "intel/wtm2"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 6cc06c22b4..d2dda6725f 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default jetway/nf81-t56n-lf
+	default "jetway/nf81-t56n-lf"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 5584eb3111..1ccdf1a185 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default kontron/986lcd-m
+	default "kontron/986lcd-m"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index c215bdf65b..1cefa599b4 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -17,7 +17,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default kontron/ktqm77
+	default "kontron/ktqm77"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/g505s/Kconfig b/src/mainboard/lenovo/g505s/Kconfig
index b80019ecf4..a277145f2c 100644
--- a/src/mainboard/lenovo/g505s/Kconfig
+++ b/src/mainboard/lenovo/g505s/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/g505s
+	default "lenovo/g505s"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig
index 4495d79bb2..a300d167de 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/l520
+	default "lenovo/l520"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index c7faebb429..662c9a5ad3 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/s230u
+	default "lenovo/s230u"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index a68d1fa13e..9355540713 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -47,7 +47,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t400
+	default "lenovo/t400"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig
index 329d08de26..943bf43e0a 100644
--- a/src/mainboard/lenovo/t410/Kconfig
+++ b/src/mainboard/lenovo/t410/Kconfig
@@ -44,7 +44,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t410
+	default "lenovo/t410"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 5148604a68..d26ad1714b 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -49,7 +49,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t420
+	default "lenovo/t420"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index 190f35e4b5..89f84fccd8 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -48,7 +48,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t420s
+	default "lenovo/t420s"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index 7137b5eb73..78da38502b 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t430
+	default "lenovo/t430"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 0c7d0756ba..36f03ae468 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t430s
+	default "lenovo/t430s"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig
index bf821f3d0c..faaa73a78c 100644
--- a/src/mainboard/lenovo/t440p/Kconfig
+++ b/src/mainboard/lenovo/t440p/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t440p
+	default "lenovo/t440p"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index d4934d6685..a6183d9f08 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -49,7 +49,7 @@ config VARIANT_DIR
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t520
+	default "lenovo/t520"
 
 config DEVICETREE
 	string
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index f63a12054f..d1ba6a8fd0 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -35,7 +35,7 @@ config VARIANT_DIR
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t530
+	default "lenovo/t530"
 
 config DEVICETREE
 	string
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 436b035a1e..58d41a6b57 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/t60
+	default "lenovo/t60"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig
index e7da8d0d77..2cf3a8f95d 100644
--- a/src/mainboard/lenovo/x131e/Kconfig
+++ b/src/mainboard/lenovo/x131e/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x131e
+	default "lenovo/x131e"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index a15cadf202..91ba20817c 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x1_carbon_gen1
+	default "lenovo/x1_carbon_gen1"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
index 5e88c21c2f..432c805078 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -44,7 +44,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x200
+	default "lenovo/x200"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
index e40c0d3e41..a94d24ed75 100644
--- a/src/mainboard/lenovo/x201/Kconfig
+++ b/src/mainboard/lenovo/x201/Kconfig
@@ -44,7 +44,7 @@ config FMDFILE
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x201
+	default "lenovo/x201"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index c80c2520b2..b20255e1cc 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -43,7 +43,7 @@ config VBOOT_VBNV_OFFSET
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x220
+	default "lenovo/x220"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index a043efcd70..e7edf6bb61 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -29,7 +29,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x230
+	default "lenovo/x230"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index a1a5fec7c0..1815892d4a 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lenovo/x60
+	default "lenovo/x60"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index f8a3f3a2ec..92d77434f5 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lippert/frontrunner-af
+	default "lippert/frontrunner-af"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 67efdfea9b..74b335a9fa 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default lippert/toucan-af
+	default "lippert/toucan-af"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/msi/ms7707/Kconfig b/src/mainboard/msi/ms7707/Kconfig
index 4923bbfdea..c1a1b4c748 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default msi/ms7707
+	default "msi/ms7707"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/msi/ms7721/Kconfig b/src/mainboard/msi/ms7721/Kconfig
index 5fa4768083..1fee74790e 100644
--- a/src/mainboard/msi/ms7721/Kconfig
+++ b/src/mainboard/msi/ms7721/Kconfig
@@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default msi/ms7721
+	default "msi/ms7721"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig
index a104fecd8c..6a613849ea 100644
--- a/src/mainboard/packardbell/ms2290/Kconfig
+++ b/src/mainboard/packardbell/ms2290/Kconfig
@@ -16,7 +16,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default packardbell/ms2290
+	default "packardbell/ms2290"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig
index 07aaa8c1b6..3396845559 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -35,7 +35,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default pcengines/apu1
+	default "pcengines/apu1"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 6c3958b30e..0437c84d28 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -36,7 +36,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default pcengines/apu2
+	default "pcengines/apu2"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig
index e5e3ff590a..a89daa1309 100644
--- a/src/mainboard/portwell/m107/Kconfig
+++ b/src/mainboard/portwell/m107/Kconfig
@@ -51,7 +51,7 @@ endchoice
 
 config MAINBOARD_DIR
 	string
-	default portwell/m107
+	default "portwell/m107"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index 224bde0e67..466e03ec7a 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -40,7 +40,7 @@ config PCIEXP_AER
 
 config MAINBOARD_DIR
 	string
-	default purism/librem_bdw
+	default "purism/librem_bdw"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 563b77392e..9d08c96a03 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default roda/rk886ex
+	default "roda/rk886ex"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index fd29739701..7516255f5b 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default roda/rk9
+	default "roda/rk9"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 2d1544b12a..f87ba8f739 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -29,7 +29,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default samsung/lumpy
+	default "samsung/lumpy"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index a2919f94e0..5deb0f0722 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -25,7 +25,7 @@ config VBOOT
 
 config MAINBOARD_DIR
 	string
-	default samsung/stumpy
+	default "samsung/stumpy"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index 6d27b3f1bd..0e289c18d4 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -18,7 +18,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default sapphire/pureplatinumh61
+	default "sapphire/pureplatinumh61"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/scaleway/tagada/Kconfig b/src/mainboard/scaleway/tagada/Kconfig
index 9530505c42..25cb7e13d7 100644
--- a/src/mainboard/scaleway/tagada/Kconfig
+++ b/src/mainboard/scaleway/tagada/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default scaleway/tagada
+	default "scaleway/tagada"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig
index 0b8cff3318..52883b8bf5 100644
--- a/src/mainboard/siemens/mc_apl1/Kconfig
+++ b/src/mainboard/siemens/mc_apl1/Kconfig
@@ -13,7 +13,7 @@ if BOARD_SIEMENS_BASEBOARD_MC_APL1
 
 config MAINBOARD_DIR
 	string
-	default siemens/mc_apl1
+	default "siemens/mc_apl1"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/sifive/hifive-unleashed/Kconfig b/src/mainboard/sifive/hifive-unleashed/Kconfig
index fc9bc1eeb9..460fdfb234 100644
--- a/src/mainboard/sifive/hifive-unleashed/Kconfig
+++ b/src/mainboard/sifive/hifive-unleashed/Kconfig
@@ -26,7 +26,7 @@ config HEAP_SIZE
 
 config MAINBOARD_DIR
 	string
-	default sifive/hifive-unleashed
+	default "sifive/hifive-unleashed"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 322ac0c296..70096229b9 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default ti/beaglebone
+	default "ti/beaglebone"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/northbridge/amd/pi/Kconfig b/src/northbridge/amd/pi/Kconfig
index 65c655689a..c0df2a1abd 100644
--- a/src/northbridge/amd/pi/Kconfig
+++ b/src/northbridge/amd/pi/Kconfig
@@ -41,9 +41,9 @@ config S3_VGA_ROM_RUN
 	bool
 	default n
 
-source src/northbridge/amd/pi/00630F01/Kconfig
-source src/northbridge/amd/pi/00730F01/Kconfig
-source src/northbridge/amd/pi/00660F01/Kconfig
+source "src/northbridge/amd/pi/00630F01/Kconfig"
+source "src/northbridge/amd/pi/00730F01/Kconfig"
+source "src/northbridge/amd/pi/00660F01/Kconfig"
 
 config HW_MEM_HOLE_SIZEK
 	hex
diff --git a/src/southbridge/amd/agesa/Kconfig b/src/southbridge/amd/agesa/Kconfig
index e5bc990bf9..7162c27bff 100644
--- a/src/southbridge/amd/agesa/Kconfig
+++ b/src/southbridge/amd/agesa/Kconfig
@@ -13,4 +13,4 @@
 # GNU General Public License for more details.
 #
 
-source src/southbridge/amd/agesa/hudson/Kconfig
+source "src/southbridge/amd/agesa/hudson/Kconfig"
diff --git a/src/southbridge/amd/cimx/Kconfig b/src/southbridge/amd/cimx/Kconfig
index 62a717be54..3e12327708 100644
--- a/src/southbridge/amd/cimx/Kconfig
+++ b/src/southbridge/amd/cimx/Kconfig
@@ -17,4 +17,4 @@ config AMD_SB_CIMX
 	bool
 	default n
 
-source src/southbridge/amd/cimx/sb800/Kconfig
+source "src/southbridge/amd/cimx/sb800/Kconfig"
diff --git a/src/southbridge/amd/pi/Kconfig b/src/southbridge/amd/pi/Kconfig
index 2fb509c7eb..531b460ea5 100644
--- a/src/southbridge/amd/pi/Kconfig
+++ b/src/southbridge/amd/pi/Kconfig
@@ -13,4 +13,4 @@
 # GNU General Public License for more details.
 #
 
-source src/southbridge/amd/pi/hudson/Kconfig
+source "src/southbridge/amd/pi/hudson/Kconfig"
diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig
index 44b3940fa7..10a49473a1 100644
--- a/src/vendorcode/amd/Kconfig
+++ b/src/vendorcode/amd/Kconfig
@@ -44,7 +44,7 @@ config CPU_AMD_AGESA_OPENSOURCE
 endchoice
 
 if CPU_AMD_AGESA_BINARY_PI
-source src/vendorcode/amd/pi/Kconfig
+source "src/vendorcode/amd/pi/Kconfig"
 endif
 
 config AGESA_EXTRA_TIMESTAMPS
diff --git a/src/vendorcode/eltan/security/Kconfig b/src/vendorcode/eltan/security/Kconfig
index 1cc0365720..9a89381d73 100644
--- a/src/vendorcode/eltan/security/Kconfig
+++ b/src/vendorcode/eltan/security/Kconfig
@@ -19,8 +19,8 @@ if USE_VENDORCODE_ELTAN
 
 menu "Eltan Security Settings"
 
-source src/vendorcode/eltan/security/mboot/Kconfig
-source src/vendorcode/eltan/security/verified_boot/Kconfig
+source "src/vendorcode/eltan/security/mboot/Kconfig"
+source "src/vendorcode/eltan/security/verified_boot/Kconfig"
 
 endmenu
 
diff --git a/src/vendorcode/google/Kconfig b/src/vendorcode/google/Kconfig
index fcb28dfc97..498d0edb08 100644
--- a/src/vendorcode/google/Kconfig
+++ b/src/vendorcode/google/Kconfig
@@ -12,7 +12,7 @@
 ## GNU General Public License for more details.
 ##
 
-source src/vendorcode/google/chromeos/Kconfig
+source "src/vendorcode/google/chromeos/Kconfig"
 
 config GOOGLE_SMBIOS_MAINBOARD_VERSION
 	bool