From 75be3245247122b8eca386fca888eff1fbeae938 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 23 Jul 2021 11:32:28 +0200 Subject: [PATCH] mb/*: Specify type of `FMDFILE` once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specify the type of the `FMDFILE` Kconfig symbol once instead of doing so on each and every mainboard. Change-Id: I810bd3fe8d42102586db6c2c58b7037a60189257 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/56557 Reviewed-by: Arthur Heymans Reviewed-by: Patrick Georgi Reviewed-by: Felix Singer Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/mainboard/51nb/x210/Kconfig | 1 - src/mainboard/amd/bilby/Kconfig | 1 - src/mainboard/amd/majolica/Kconfig | 1 - src/mainboard/amd/mandolin/Kconfig | 1 - src/mainboard/cavium/cn8100_sff_evb/Kconfig | 1 - src/mainboard/clevo/kbl-u/Kconfig | 1 - src/mainboard/emulation/qemu-i440fx/Kconfig | 1 - src/mainboard/emulation/qemu-q35/Kconfig | 1 - src/mainboard/google/dedede/Kconfig | 1 - src/mainboard/google/deltaur/Kconfig | 1 - src/mainboard/google/guybrush/Kconfig | 1 - src/mainboard/google/hatch/Kconfig | 2 -- src/mainboard/google/kahlee/Kconfig | 1 - src/mainboard/google/mancomb/Kconfig | 1 - src/mainboard/google/zork/Kconfig | 1 - src/mainboard/intel/cedarisland_crb/Kconfig | 1 - src/mainboard/intel/coffeelake_rvp/Kconfig | 1 - src/mainboard/intel/leafhill/Kconfig | 1 - src/mainboard/intel/minnow3/Kconfig | 1 - src/mainboard/lenovo/t400/Kconfig | 1 - src/mainboard/lenovo/t410/Kconfig | 1 - src/mainboard/lenovo/t420/Kconfig | 1 - src/mainboard/lenovo/t420s/Kconfig | 1 - src/mainboard/lenovo/t430/Kconfig | 1 - src/mainboard/lenovo/t430s/Kconfig | 1 - src/mainboard/lenovo/t440p/Kconfig | 1 - src/mainboard/lenovo/t520/Kconfig | 1 - src/mainboard/lenovo/t530/Kconfig | 1 - src/mainboard/lenovo/x131e/Kconfig | 1 - src/mainboard/lenovo/x1_carbon_gen1/Kconfig | 1 - src/mainboard/lenovo/x200/Kconfig | 1 - src/mainboard/lenovo/x201/Kconfig | 1 - src/mainboard/lenovo/x220/Kconfig | 1 - src/mainboard/lenovo/x230/Kconfig | 1 - src/mainboard/lenovo/x60/Kconfig | 1 - src/mainboard/ocp/deltalake/Kconfig | 1 - src/mainboard/ocp/tiogapass/Kconfig | 1 - src/mainboard/opencellular/elgon/Kconfig | 1 - src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig | 1 - src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig | 1 - src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig | 1 - src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig | 1 - src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig | 1 - src/mainboard/supermicro/x11-lga1151-series/Kconfig | 1 - src/mainboard/ti/beaglebone/Kconfig | 1 - src/mainboard/up/squared/Kconfig | 1 - 46 files changed, 47 deletions(-) diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig index a980acc695..11f36cd4fa 100644 --- a/src/mainboard/51nb/x210/Kconfig +++ b/src/mainboard/51nb/x210/Kconfig @@ -39,7 +39,6 @@ config DIMM_SPD_SIZE default 512 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" config NO_POST diff --git a/src/mainboard/amd/bilby/Kconfig b/src/mainboard/amd/bilby/Kconfig index 5333ba0005..9510238944 100644 --- a/src/mainboard/amd/bilby/Kconfig +++ b/src/mainboard/amd/bilby/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD config FMDFILE - string default "src/mainboard/amd/bilby/board.fmd" config AMD_LPC_DEBUG_CARD diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig index 622870d273..7d5b30a1cd 100644 --- a/src/mainboard/amd/majolica/Kconfig +++ b/src/mainboard/amd/majolica/Kconfig @@ -12,7 +12,6 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_HAS_CHROMEOS config FMDFILE - string default "src/mainboard/amd/majolica/chromeos.fmd" if CHROMEOS default "src/mainboard/amd/majolica/board.fmd" diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig index 358ebab19f..e0bf3e3c58 100644 --- a/src/mainboard/amd/mandolin/Kconfig +++ b/src/mainboard/amd/mandolin/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD config FMDFILE - string default "src/mainboard/amd/mandolin/variants/\$(CONFIG_VARIANT_DIR)/board.fmd" config AMD_LPC_DEBUG_CARD diff --git a/src/mainboard/cavium/cn8100_sff_evb/Kconfig b/src/mainboard/cavium/cn8100_sff_evb/Kconfig index 5286b6465a..a1813bb70a 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig +++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig @@ -34,7 +34,6 @@ config UART_FOR_CONSOLE default 0 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" config MAX_CPUS diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig index 669e9f8d4f..93ddb821c1 100644 --- a/src/mainboard/clevo/kbl-u/Kconfig +++ b/src/mainboard/clevo/kbl-u/Kconfig @@ -48,7 +48,6 @@ config DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/\$(CONFIG_VARIANT_DIR)/fmds/vboot-ro.fmd" if VBOOT && !VBOOT_SLOTS_RW_A # TODO # default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index ebf7b034be..1b9edf04b9 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -44,7 +44,6 @@ config VBOOT_SLOTS_RW_A endif config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A config VBOOT_VBNV_OFFSET diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 4fb8dea1b2..04dce28261 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -28,7 +28,6 @@ config VBOOT select GBB_FLAG_DISABLE_FWMP config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab-16M.fmd" if VBOOT_SLOTS_RW_AB diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 189fa79cf3..ac77b698a9 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -76,7 +76,6 @@ config DIMM_SPD_SIZE default 512 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-dedede-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index d40eebb4c2..7ce87cff37 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -43,7 +43,6 @@ config DRIVER_TPM_I2C_ADDR default 0x50 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-gbe.fmd" if BOARD_GOOGLE_DELTAN default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_GOOGLE_DELTAUR diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index a0a18a01e2..fa00c76f14 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -65,7 +65,6 @@ config VBOOT_VBNV_OFFSET default 0x2A config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" config MAINBOARD_DIR diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 64ad91d542..947f816300 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -87,14 +87,12 @@ config UART_FOR_CONSOLE if BOARD_GOOGLE_BASEBOARD_HATCH config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS endif if BOARD_GOOGLE_BASEBOARD_PUFF config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-puff-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos-puff-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 2a6ed66cf7..3128493732 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -71,7 +71,6 @@ config MAINBOARD_FAMILY default "Google_Kahlee" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS default "" help diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig index 82c08fdbb8..1a247e7efd 100644 --- a/src/mainboard/google/mancomb/Kconfig +++ b/src/mainboard/google/mancomb/Kconfig @@ -47,7 +47,6 @@ config VBOOT_VBNV_OFFSET default 0x2A config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" config MAINBOARD_DIR diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index aa9c826b96..a9ca5dad6f 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -58,7 +58,6 @@ config ELOG_BOOT_COUNT_CMOS_OFFSET # FMDFILE is set here so that coreboot build picks up this flash map layout # even when CHROMEOS is not selected when building upstream. config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" config MAINBOARD_DIR diff --git a/src/mainboard/intel/cedarisland_crb/Kconfig b/src/mainboard/intel/cedarisland_crb/Kconfig index fbcce7492f..e9344a1c9d 100644 --- a/src/mainboard/intel/cedarisland_crb/Kconfig +++ b/src/mainboard/intel/cedarisland_crb/Kconfig @@ -15,7 +15,6 @@ config MAINBOARD_PART_NUMBER default "Cedar Island CRB" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" endif diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index 76b71aba1a..f0c7f90060 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -61,7 +61,6 @@ config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config FMDFILE - string depends on VBOOT default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_16384 default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos_32MB.fmd" if BOARD_ROMSIZE_KB_32768 diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index 04bc1863d3..3d25aaa007 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -14,7 +14,6 @@ config MAINBOARD_PART_NUMBER default "Leafhill" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/leafhill.\$(CONFIG_COREBOOT_ROMSIZE_KB).fmd" config UART_FOR_CONSOLE diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index b45e6bbb01..66bee2f0ea 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -14,7 +14,6 @@ config MAINBOARD_PART_NUMBER default "Minnow3" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/minnow3.fmd" config UART_FOR_CONSOLE diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index 7b0ef7042e..5e17eb5eea 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -43,7 +43,6 @@ config VBOOT_VBNV_OFFSET default 0x82 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig index a25ea627e7..333302ea80 100644 --- a/src/mainboard/lenovo/t410/Kconfig +++ b/src/mainboard/lenovo/t410/Kconfig @@ -43,7 +43,6 @@ config CBFS_SIZE default 0x300000 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index b57a884eb1..d1cd0ec117 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -44,7 +44,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index 1557644d89..db6e2711e0 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -43,7 +43,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index aaa7b347c2..4a51562fee 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -42,7 +42,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 6d0a1205f9..88816859db 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -45,7 +45,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig index 9e2687ab48..991c1bd0d9 100644 --- a/src/mainboard/lenovo/t440p/Kconfig +++ b/src/mainboard/lenovo/t440p/Kconfig @@ -39,7 +39,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 2602309a9b..e8f1df7977 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -54,7 +54,6 @@ config OVERRIDE_DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 597ea1dc5b..eb301db15c 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -44,7 +44,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config VARIANT_DIR diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 3a876271f4..b8fc4d6f56 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -37,7 +37,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index b04e90a02c..d360c56bd8 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -43,7 +43,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index ffb7bb6435..c8783c1e72 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -39,7 +39,6 @@ config VBOOT_VBNV_OFFSET default 0x82 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index b98b541ecd..af314961bb 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -39,7 +39,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 0b3ee00b20..f4065d0fc7 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -50,7 +50,6 @@ config VARIANT_DIR default "x1" if BOARD_LENOVO_X1 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index e334518b90..cc9d708278 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -45,7 +45,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index c7a3e00fde..d5b5f33366 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -40,7 +40,6 @@ config VBOOT_VBNV_OFFSET default 0x76 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT config MAINBOARD_DIR diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index 2162993b5c..06d8393f90 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -44,7 +44,6 @@ config MAX_SOCKET default 1 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" # Deltalake is single socket server, the platform design has 1 DIMM per channel diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig index 5784f02d7e..74ab25cab6 100644 --- a/src/mainboard/ocp/tiogapass/Kconfig +++ b/src/mainboard/ocp/tiogapass/Kconfig @@ -26,7 +26,6 @@ config MAINBOARD_FAMILY default "TiogaPass" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" endif # BOARD_OCP_TIOGAPASS diff --git a/src/mainboard/opencellular/elgon/Kconfig b/src/mainboard/opencellular/elgon/Kconfig index dd8f117ee7..6c20295d1d 100644 --- a/src/mainboard/opencellular/elgon/Kconfig +++ b/src/mainboard/opencellular/elgon/Kconfig @@ -56,7 +56,6 @@ config UART_FOR_CONSOLE default 0 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot.fmd" if VBOOT diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig index c1ec2eb259..3e062a4e42 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig @@ -24,7 +24,6 @@ config VBOOT select GBB_FLAG_DISABLE_FWMP config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" endif # BOARD_SIEMENS_MC_APL2 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig index 50a390beb8..6cf02abe24 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -26,7 +26,6 @@ config VBOOT select GBB_FLAG_DISABLE_FWMP config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" endif # BOARD_SIEMENS_MC_APL4 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig index c82c840396..877470fd96 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig @@ -27,7 +27,6 @@ config VBOOT select GBB_FLAG_DISABLE_FWMP config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" endif # BOARD_SIEMENS_MC_APL5 diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig index 44bff7cb4e..812c4af714 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig @@ -23,7 +23,6 @@ config VBOOT select GBB_FLAG_DISABLE_FWMP config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" endif # BOARD_SIEMENS_MC_APL6 diff --git a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig index b6e2b332ab..f484eaa4fc 100644 --- a/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig +++ b/src/mainboard/siemens/mc_ehl/variants/mc_ehl1/Kconfig @@ -1,7 +1,6 @@ if BOARD_SIEMENS_MC_EHL1 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/mc_ehl.fmd" endif # BOARD_SIEMENS_MC_EHL1 diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig index 08cb3fbf44..aa7965c49f 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig +++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig @@ -58,7 +58,6 @@ config VBOOT_VBNV_OFFSET default 0x2a config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-ro-rwab.fmd" if VBOOT_SLOTS_RW_AB config DRIVERS_IPMI_SUPERMICRO_OEM diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index 274e2a412e..7f061d65e2 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -29,7 +29,6 @@ config UART_FOR_CONSOLE default 0 config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd" endif # BOARD_TI_BEAGLEBONE diff --git a/src/mainboard/up/squared/Kconfig b/src/mainboard/up/squared/Kconfig index d953545f9c..7401c9570d 100644 --- a/src/mainboard/up/squared/Kconfig +++ b/src/mainboard/up/squared/Kconfig @@ -37,7 +37,6 @@ config MAINBOARD_PART_NUMBER default "Squared" config FMDFILE - string default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/upsquared.fmd" if !VBOOT default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-ro.fmd" if !VBOOT_SLOTS_RW_A default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB