Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52507 )
Change subject: mainboard: Drop unnecessary CONFIG_ prefix from Kconfigs ......................................................................
mainboard: Drop unnecessary CONFIG_ prefix from Kconfigs
Change-Id: I23dda484c47dc79580717932bd7a2df6559aecdb Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/51nb/x210/Kconfig M src/mainboard/amd/mandolin/Kconfig M src/mainboard/asrock/g41c-gs/Kconfig M src/mainboard/asus/p2b/Kconfig M src/mainboard/asus/p5qc/Kconfig M src/mainboard/asus/p5qpl-am/Kconfig M src/mainboard/cavium/cn8100_sff_evb/Kconfig M src/mainboard/clevo/cml-u/Kconfig M src/mainboard/clevo/kbl-u/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-q35/Kconfig M src/mainboard/facebook/fbg1701/Kconfig M src/mainboard/foxconn/g41s-k/Kconfig M src/mainboard/gigabyte/ga-b75m-d3h/Kconfig M src/mainboard/gigabyte/ga-h61m-series/Kconfig M src/mainboard/google/auron/Kconfig M src/mainboard/google/brya/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/deltaur/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/guybrush/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/mancomb/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/rambi/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/volteer/Kconfig M src/mainboard/google/zork/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/intel/adlrvp/Kconfig M src/mainboard/intel/cedarisland_crb/Kconfig M src/mainboard/intel/coffeelake_rvp/Kconfig M src/mainboard/intel/elkhartlake_crb/Kconfig M src/mainboard/intel/galileo/Kconfig M src/mainboard/intel/icelake_rvp/Kconfig M src/mainboard/intel/jasperlake_rvp/Kconfig M src/mainboard/intel/kblrvp/Kconfig M src/mainboard/intel/leafhill/Kconfig M src/mainboard/intel/minnow3/Kconfig M src/mainboard/intel/tglrvp/Kconfig M src/mainboard/kontron/bsl6/Kconfig M src/mainboard/kontron/mal10/Kconfig M src/mainboard/lenovo/t400/Kconfig M src/mainboard/lenovo/t410/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t440p/Kconfig M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t60/Kconfig M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x200/Kconfig M src/mainboard/lenovo/x201/Kconfig M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x60/Kconfig M src/mainboard/lippert/frontrunner-af/Kconfig M src/mainboard/ocp/deltalake/Kconfig M src/mainboard/ocp/tiogapass/Kconfig M src/mainboard/opencellular/elgon/Kconfig M src/mainboard/pcengines/apu2/Kconfig M src/mainboard/prodrive/hermes/Kconfig M src/mainboard/protectli/vault_bsw/Kconfig M src/mainboard/purism/librem_bdw/Kconfig M src/mainboard/purism/librem_cnl/Kconfig M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/roda/rv11/Kconfig M src/mainboard/siemens/chili/Kconfig M src/mainboard/siemens/mc_apl1/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig M src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig M src/mainboard/supermicro/x11-lga1151-series/Kconfig M src/mainboard/system76/whl-u/Kconfig M src/mainboard/ti/beaglebone/Kconfig M src/mainboard/up/squared/Kconfig 86 files changed, 126 insertions(+), 126 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/52507/1
diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig index df827ce..0eec5d4 100644 --- a/src/mainboard/51nb/x210/Kconfig +++ b/src/mainboard/51nb/x210/Kconfig @@ -42,7 +42,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
config NO_POST default y diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig index 2798209..049f520 100644 --- a/src/mainboard/amd/mandolin/Kconfig +++ b/src/mainboard/amd/mandolin/Kconfig @@ -15,7 +15,7 @@
config FMDFILE string - default "src/mainboard/amd/mandolin/variants/$(CONFIG_VARIANT_DIR)/board.fmd" + default "src/mainboard/amd/mandolin/variants/$(VARIANT_DIR)/board.fmd"
config AMD_LPC_DEBUG_CARD bool "Enable LPC-Serial debug card on the debug header" @@ -67,7 +67,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config ONBOARD_VGA_IS_PRIMARY bool diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig index 900bfef..a607856 100644 --- a/src/mainboard/asrock/g41c-gs/Kconfig +++ b/src/mainboard/asrock/g41c-gs/Kconfig @@ -44,7 +44,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
# Override the default variant behavior, since the data.vbt is the same config INTEL_GMA_VBT_FILE diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index b9d482b..39a1644 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -49,7 +49,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config IRQ_SLOT_COUNT int diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig index 41c11c0..c38c7ad 100644 --- a/src/mainboard/asus/p5qc/Kconfig +++ b/src/mainboard/asus/p5qc/Kconfig @@ -35,7 +35,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config GPIO_C string diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig index 07ba8de..94c7358 100644 --- a/src/mainboard/asus/p5qpl-am/Kconfig +++ b/src/mainboard/asus/p5qpl-am/Kconfig @@ -35,7 +35,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
# Override the default variant behavior, since the data.vbt is the same config INTEL_GMA_VBT_FILE diff --git a/src/mainboard/cavium/cn8100_sff_evb/Kconfig b/src/mainboard/cavium/cn8100_sff_evb/Kconfig index 1c3d2ec..0cb63ab 100644 --- a/src/mainboard/cavium/cn8100_sff_evb/Kconfig +++ b/src/mainboard/cavium/cn8100_sff_evb/Kconfig @@ -36,7 +36,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
config MAX_CPUS default 4 diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig index 51ee8a9..924ec78 100644 --- a/src/mainboard/clevo/cml-u/Kconfig +++ b/src/mainboard/clevo/cml-u/Kconfig @@ -39,7 +39,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config CBFS_SIZE hex diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig index c8c364b..2f77676 100644 --- a/src/mainboard/clevo/kbl-u/Kconfig +++ b/src/mainboard/clevo/kbl-u/Kconfig @@ -49,14 +49,14 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(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 + default "src/mainboard/$(MAINBOARD_DIR)/variants/$(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 -# default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/fmds/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB +# default "src/mainboard/$(MAINBOARD_DIR)/fmds/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB +# default "src/mainboard/$(MAINBOARD_DIR)/fmds/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB
config DIMM_MAX int diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 0b3d322..70611a2 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -45,7 +45,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
config VBOOT_VBNV_OFFSET hex diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 924271e..cf2c0f4 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -30,8 +30,8 @@
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 + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab-16M.fmd" if VBOOT_SLOTS_RW_AB
if ARCH_BOOTBLOCK_X86_64 # Need to install page tables in DRAM as the virtual MMU has problems translating paging diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig index 3b69a0b..f2d2d56 100644 --- a/src/mainboard/facebook/fbg1701/Kconfig +++ b/src/mainboard/facebook/fbg1701/Kconfig @@ -38,7 +38,7 @@ default y
config FMDFILE - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rw.fmd"
config RW_REGION_ONLY default "%/payload logo.bmp %/ramstage vbt.bin %/dsdt.aml config %/postcar" diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig index 8bdc958..b2363fd 100644 --- a/src/mainboard/foxconn/g41s-k/Kconfig +++ b/src/mainboard/foxconn/g41s-k/Kconfig @@ -32,6 +32,6 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
endif # BOARD_FOXCONN_G41S_K diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index 4eda267..0114d9d 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -43,7 +43,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V + default "variants/$(VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V
# Override the default variant behavior, since the data.vbt is the same config INTEL_GMA_VBT_FILE diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig index 60d516b..7378bf6 100644 --- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig +++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig @@ -36,7 +36,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
# Override the default variant behavior, since the data.vbt is the same config INTEL_GMA_VBT_FILE diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 507d2b3..803703a 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -48,7 +48,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config EC_GOOGLE_CHROMEEC_BOARDNAME string diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 1fa6ff4..afc1acc 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -53,7 +53,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_DIR string diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 8f0f56c..fa1a27b 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -71,7 +71,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config CBFS_SIZE hex diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 53db0ad..2efe473 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -75,8 +75,8 @@
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 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-dedede-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-dedede-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
config MAINBOARD_DIR string @@ -115,7 +115,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_DEDEDE + default "variants/$(VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_DEDEDE
config UART_FOR_CONSOLE int diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index 4299e67..58145f6 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -45,12 +45,12 @@
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 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-gbe.fmd" if BOARD_GOOGLE_DELTAN + default "src/mainboard/$(MAINBOARD_DIR)/chromeos.fmd" if BOARD_GOOGLE_DELTAUR
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config POWER_OFF_ON_CR50_UPDATE bool diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 888f097..0fcaf93 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -87,7 +87,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config VBOOT select HAS_RECOVERY_MRC_CACHE diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 9ca17d5..c5a33d4 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -35,7 +35,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index aba30cb..492d6c5 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -63,7 +63,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config TPM_PIRQ hex diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index 3072fc8..0549847 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -45,7 +45,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/chromeos.fmd"
config MAINBOARD_DIR string @@ -89,7 +89,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_FAMILY string diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index dc2cc5e..79c32e5 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -93,15 +93,15 @@ 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 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-hatch-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS + default "src/mainboard/$(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 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-puff-16MiB.fmd" if BOARD_ROMSIZE_KB_16384 && CHROMEOS + default "src/mainboard/$(MAINBOARD_DIR)/chromeos-puff-32MiB.fmd" if BOARD_ROMSIZE_KB_32768 && CHROMEOS
config POWER_OFF_ON_CR50_UPDATE bool @@ -145,7 +145,7 @@ config OVERRIDE_DEVICETREE string default "variants/helios_diskswap/overridetree.cb" if BOARD_GOOGLE_HELIOS_DISKSWAP - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config TPM_TIS_ACPI_INTERRUPT int diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index ca90e14e..8e1a012 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -62,7 +62,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config MAINBOARD_FAMILY string @@ -70,7 +70,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS + default "src/mainboard/$(MAINBOARD_DIR)/variants/baseboard/chromeos.fmd" if CHROMEOS default "" help The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig index ea069e5..4071b90 100644 --- a/src/mainboard/google/mancomb/Kconfig +++ b/src/mainboard/google/mancomb/Kconfig @@ -38,7 +38,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/chromeos.fmd"
config MAINBOARD_DIR string @@ -72,7 +72,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_FAMILY string diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index c0219ab..e07ae26 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -73,7 +73,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_OCTOPUS + default "variants/$(VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_OCTOPUS
config MAINBOARD_PART_NUMBER string @@ -132,6 +132,6 @@ default 255 if BOARD_GOOGLE_OCTOPUS
config FMDFILE - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS + default "src/mainboard/$(MAINBOARD_DIR)/default.fmd" if !CHROMEOS
endif # BOARD_GOOGLE_OCTOPUS diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 5f7f18c..8ea675f 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -67,7 +67,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config EC_GOOGLE_CHROMEEC_BOARDNAME string diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 616ab9d..e413250 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -96,7 +96,7 @@ default 0xc00
config FMDFILE - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS + default "src/mainboard/$(MAINBOARD_DIR)/default.fmd" if !CHROMEOS
# Override the default behavior, since the data.vbt is the same for all variants config INTEL_GMA_VBT_FILE diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 26502de..4127246 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -89,7 +89,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config VBOOT select HAS_RECOVERY_MRC_CACHE diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 22c8e73..3a3067c 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -50,7 +50,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config VGA_BIOS_FILE string diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 8d40700..b14f1e7 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -67,7 +67,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config DRIVER_TPM_SPI_BUS default 0x1 diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index bb355d3..316b0ab 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -59,7 +59,7 @@ # even when CHROMEOS is not selected when building upstream. config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/chromeos.fmd"
config MAINBOARD_DIR string @@ -98,7 +98,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_FAMILY string diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig index dc5f9cc..ff5a3e5 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig @@ -46,7 +46,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config VGA_BIOS_FILE string diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig index ce4acae..9d1cd7a 100644 --- a/src/mainboard/intel/adlrvp/Kconfig +++ b/src/mainboard/intel/adlrvp/Kconfig @@ -59,7 +59,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/intel/cedarisland_crb/Kconfig b/src/mainboard/intel/cedarisland_crb/Kconfig index 9e9e66e..8ab3417 100644 --- a/src/mainboard/intel/cedarisland_crb/Kconfig +++ b/src/mainboard/intel/cedarisland_crb/Kconfig @@ -18,6 +18,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
endif diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index b0f00b0..21f9517 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -62,13 +62,13 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(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 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos.fmd" if BOARD_ROMSIZE_KB_16384 + default "src/mainboard/$(MAINBOARD_DIR)/chromeos_32MB.fmd" if BOARD_ROMSIZE_KB_32768
config INCLUDE_SND_MAX98357_DA7219_NHLT bool "Include blobs for audio with MAX98357_DA7219" diff --git a/src/mainboard/intel/elkhartlake_crb/Kconfig b/src/mainboard/intel/elkhartlake_crb/Kconfig index e31abd6..032789c 100644 --- a/src/mainboard/intel/elkhartlake_crb/Kconfig +++ b/src/mainboard/intel/elkhartlake_crb/Kconfig @@ -32,7 +32,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig index 6fee2f3..0145828 100644 --- a/src/mainboard/intel/galileo/Kconfig +++ b/src/mainboard/intel/galileo/Kconfig @@ -107,7 +107,7 @@ config FMDFILE string "FMAP description file in fmd format" depends on VBOOT - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/vboot.fmd" help The build system creates a default FMAP from ROM_SIZE and CBFS_SIZE, but in some cases more complex setups are required. diff --git a/src/mainboard/intel/icelake_rvp/Kconfig b/src/mainboard/intel/icelake_rvp/Kconfig index 88484ef..0dbce5e 100644 --- a/src/mainboard/intel/icelake_rvp/Kconfig +++ b/src/mainboard/intel/icelake_rvp/Kconfig @@ -41,7 +41,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/intel/jasperlake_rvp/Kconfig b/src/mainboard/intel/jasperlake_rvp/Kconfig index dfcac10..80705a6 100644 --- a/src/mainboard/intel/jasperlake_rvp/Kconfig +++ b/src/mainboard/intel/jasperlake_rvp/Kconfig @@ -43,7 +43,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig index 8d10c1a..15a6f9e 100644 --- a/src/mainboard/intel/kblrvp/Kconfig +++ b/src/mainboard/intel/kblrvp/Kconfig @@ -53,21 +53,21 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config IFD_BIN_PATH string depends on HAVE_IFD_BIN - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp3.bin" if BOARD_INTEL_KBLRVP3 - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp7.bin" if BOARD_INTEL_KBLRVP7 - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/descriptor.rvp8.bin" if BOARD_INTEL_KBLRVP8 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/descriptor.rvp3.bin" if BOARD_INTEL_KBLRVP3 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/descriptor.rvp7.bin" if BOARD_INTEL_KBLRVP7 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/descriptor.rvp8.bin" if BOARD_INTEL_KBLRVP8
config ME_BIN_PATH string depends on HAVE_ME_BIN - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp3.bin" if BOARD_INTEL_KBLRVP3 - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp7.bin" if BOARD_INTEL_KBLRVP7 - default "3rdparty/blobs/mainboard/$(CONFIG_MAINBOARD_DIR)/me.rvp8.bin" if BOARD_INTEL_KBLRVP8 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/me.rvp3.bin" if BOARD_INTEL_KBLRVP3 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/me.rvp7.bin" if BOARD_INTEL_KBLRVP7 + default "3rdparty/blobs/mainboard/$(MAINBOARD_DIR)/me.rvp8.bin" if BOARD_INTEL_KBLRVP8
config PRERAM_CBMEM_CONSOLE_SIZE hex diff --git a/src/mainboard/intel/leafhill/Kconfig b/src/mainboard/intel/leafhill/Kconfig index 97758e1..6853276 100644 --- a/src/mainboard/intel/leafhill/Kconfig +++ b/src/mainboard/intel/leafhill/Kconfig @@ -17,7 +17,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/leafhill.$(CONFIG_COREBOOT_ROMSIZE_KB).fmd" + default "src/mainboard/$(MAINBOARD_DIR)/leafhill.$(COREBOOT_ROMSIZE_KB).fmd"
config UART_FOR_CONSOLE default 2 diff --git a/src/mainboard/intel/minnow3/Kconfig b/src/mainboard/intel/minnow3/Kconfig index 8d95a35..1b353c4 100644 --- a/src/mainboard/intel/minnow3/Kconfig +++ b/src/mainboard/intel/minnow3/Kconfig @@ -17,7 +17,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/minnow3.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/minnow3.fmd"
config UART_FOR_CONSOLE default 2 diff --git a/src/mainboard/intel/tglrvp/Kconfig b/src/mainboard/intel/tglrvp/Kconfig index 65b6044..a55b773 100644 --- a/src/mainboard/intel/tglrvp/Kconfig +++ b/src/mainboard/intel/tglrvp/Kconfig @@ -77,7 +77,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig index a3a6fbc..af9f63b 100644 --- a/src/mainboard/kontron/bsl6/Kconfig +++ b/src/mainboard/kontron/bsl6/Kconfig @@ -48,7 +48,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config CBFS_SIZE hex diff --git a/src/mainboard/kontron/mal10/Kconfig b/src/mainboard/kontron/mal10/Kconfig index f53746d..984725a 100644 --- a/src/mainboard/kontron/mal10/Kconfig +++ b/src/mainboard/kontron/mal10/Kconfig @@ -49,10 +49,10 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config OVERRIDE_DEVICETREE string - default "carriers/$(CONFIG_CARRIER_DIR)/overridetree.cb" + default "carriers/$(CARRIER_DIR)/overridetree.cb"
endif diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index d4cbc88..25a82ab 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -44,7 +44,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string @@ -66,7 +66,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config USBDEBUG_HCD_INDEX int diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig index e939234..9301087 100644 --- a/src/mainboard/lenovo/t410/Kconfig +++ b/src/mainboard/lenovo/t410/Kconfig @@ -44,7 +44,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 2dedfed..3c87d19 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -45,7 +45,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index a68d96f..e97453d 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -44,7 +44,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index 8d98e3d..19c59be 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -43,7 +43,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 54f830e..6197fbf 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -46,7 +46,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string @@ -64,7 +64,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config USBDEBUG_HCD_INDEX int diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig index 8138ce6..4da4817 100644 --- a/src/mainboard/lenovo/t440p/Kconfig +++ b/src/mainboard/lenovo/t440p/Kconfig @@ -40,7 +40,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 0b71ccd..c95dd6c 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -53,11 +53,11 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 8759ada..27b7b6b 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -45,7 +45,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config VARIANT_DIR string @@ -58,7 +58,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 57172ca..aab1e8d 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -34,7 +34,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 06c5d83..087ea3f 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -38,7 +38,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index 3ae5ade..870fe78 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -44,7 +44,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 4ae040a..cb29c76 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -40,7 +40,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string @@ -58,7 +58,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config USBDEBUG_HCD_INDEX int diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index e7daadc..1720d79 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -40,7 +40,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 8aa936c..c42cc1a 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -52,7 +52,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_PART_NUMBER string @@ -62,7 +62,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config USBDEBUG_HCD_INDEX int diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 3ecf668..c5cf142 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -46,7 +46,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
config MAINBOARD_DIR string @@ -65,7 +65,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config USBDEBUG_HCD_INDEX int diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 5083fd5..3402d19 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -42,7 +42,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-rwa.fmd" if VBOOT
config MAINBOARD_DIR string diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig index fe52332..5e89371 100644 --- a/src/mainboard/lippert/frontrunner-af/Kconfig +++ b/src/mainboard/lippert/frontrunner-af/Kconfig @@ -31,7 +31,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/ocp/deltalake/Kconfig b/src/mainboard/ocp/deltalake/Kconfig index e291af1..cef2ad0 100644 --- a/src/mainboard/ocp/deltalake/Kconfig +++ b/src/mainboard/ocp/deltalake/Kconfig @@ -47,7 +47,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
# Deltalake is single socket server, the platform design has 1 DIMM per channel config DIMM_MAX diff --git a/src/mainboard/ocp/tiogapass/Kconfig b/src/mainboard/ocp/tiogapass/Kconfig index 1e202a7..5559a55 100644 --- a/src/mainboard/ocp/tiogapass/Kconfig +++ b/src/mainboard/ocp/tiogapass/Kconfig @@ -29,6 +29,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
endif # BOARD_OCP_TIOGAPASS diff --git a/src/mainboard/opencellular/elgon/Kconfig b/src/mainboard/opencellular/elgon/Kconfig index b2085e0..1032d12 100644 --- a/src/mainboard/opencellular/elgon/Kconfig +++ b/src/mainboard/opencellular/elgon/Kconfig @@ -58,8 +58,8 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot.fmd" if VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/vboot.fmd" if VBOOT
config MAX_CPUS default 4 diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig index 82e5c3a..b8d606c 100644 --- a/src/mainboard/pcengines/apu2/Kconfig +++ b/src/mainboard/pcengines/apu2/Kconfig @@ -34,7 +34,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig index 26b333dd..454bcaf 100644 --- a/src/mainboard/prodrive/hermes/Kconfig +++ b/src/mainboard/prodrive/hermes/Kconfig @@ -48,7 +48,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/protectli/vault_bsw/Kconfig b/src/mainboard/protectli/vault_bsw/Kconfig index 5850995..e79715c 100644 --- a/src/mainboard/protectli/vault_bsw/Kconfig +++ b/src/mainboard/protectli/vault_bsw/Kconfig @@ -24,7 +24,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index cc3af55..fef3460 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -19,7 +19,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config DRIVERS_UART_8250IO def_bool n diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig index eeb4d3b..35d5a1a 100644 --- a/src/mainboard/purism/librem_cnl/Kconfig +++ b/src/mainboard/purism/librem_cnl/Kconfig @@ -36,7 +36,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config CBFS_SIZE hex diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index 22787f8..9de93f1 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -45,7 +45,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config VGA_BIOS_ID string diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig index f9e64a1..ea320c2 100644 --- a/src/mainboard/roda/rv11/Kconfig +++ b/src/mainboard/roda/rv11/Kconfig @@ -26,7 +26,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/siemens/chili/Kconfig b/src/mainboard/siemens/chili/Kconfig index a261abc..68c5b06 100644 --- a/src/mainboard/siemens/chili/Kconfig +++ b/src/mainboard/siemens/chili/Kconfig @@ -53,11 +53,11 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config INTEL_GMA_VBT_FILE string - default "src/mainboard/$(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR)/data.vbt" + default "src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt"
config DIMM_SPD_SIZE int diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig index 9c8e095..87f482d 100644 --- a/src/mainboard/siemens/mc_apl1/Kconfig +++ b/src/mainboard/siemens/mc_apl1/Kconfig @@ -26,7 +26,7 @@
config DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(VARIANT_DIR)/devicetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig index 0f32907..42c4406 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl2/Kconfig @@ -24,6 +24,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + default "src/mainboard/$(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 55fb4b1..0ff4ef7 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl4/Kconfig @@ -27,6 +27,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + default "src/mainboard/$(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 bd0b0d7..218ebaa 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl5/Kconfig @@ -27,6 +27,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + default "src/mainboard/$(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 852294a..ce6f21a 100644 --- a/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig +++ b/src/mainboard/siemens/mc_apl1/variants/mc_apl6/Kconfig @@ -23,6 +23,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/mc_apl_vboot.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/mc_apl_vboot.fmd"
endif # BOARD_SIEMENS_MC_APL6 diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig index 6c138da..7b9caa3 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig +++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig @@ -39,7 +39,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config VBOOT select VBOOT_NO_BOARD_SUPPORT @@ -61,7 +61,7 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-ro-rwab.fmd" if VBOOT_SLOTS_RW_AB + default "src/mainboard/$(MAINBOARD_DIR)/vboot-ro-rwab.fmd" if VBOOT_SLOTS_RW_AB
config DRIVERS_IPMI_SUPERMICRO_OEM bool diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig index 2861ce55..41b6387 100644 --- a/src/mainboard/system76/whl-u/Kconfig +++ b/src/mainboard/system76/whl-u/Kconfig @@ -32,7 +32,7 @@
config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" + default "variants/$(VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index 7881bdf..df278f5 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -32,6 +32,6 @@
config FMDFILE string - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd" + default "src/mainboard/$(MAINBOARD_DIR)/board.fmd"
endif # BOARD_TI_BEAGLEBONE diff --git a/src/mainboard/up/squared/Kconfig b/src/mainboard/up/squared/Kconfig index d7abbb7..1d21e98 100644 --- a/src/mainboard/up/squared/Kconfig +++ b/src/mainboard/up/squared/Kconfig @@ -40,10 +40,10 @@
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 - default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB + default "src/mainboard/$(MAINBOARD_DIR)/upsquared.fmd" if !VBOOT + default "src/mainboard/$(MAINBOARD_DIR)/vboot-ro.fmd" if !VBOOT_SLOTS_RW_A + default "src/mainboard/$(MAINBOARD_DIR)/vboot-roa.fmd" if VBOOT_SLOTS_RW_A && !VBOOT_SLOTS_RW_AB + default "src/mainboard/$(MAINBOARD_DIR)/vboot-roab.fmd" if VBOOT_SLOTS_RW_AB
config VGA_BIOS_ID string