From 8905ecbcfa524e751e20a14183c19172a2d0a268 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 23 Jul 2021 11:29:36 +0200 Subject: [PATCH] mb/*: Specify type of `OVERRIDE_DEVICETREE` once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specify the type of the `OVERRIDE_DEVICETREE` Kconfig symbol once instead of doing so on each and every mainboard. Change-Id: I4cbf4e318a30f0cf75aa8690e7454b9caa115c9d Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/56556 Reviewed-by: Arthur Heymans Reviewed-by: Patrick Georgi Reviewed-by: Felix Singer Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) --- src/mainboard/asus/h61-series/Kconfig | 1 - src/mainboard/asus/p2b/Kconfig | 1 - src/mainboard/asus/p5qpl-am/Kconfig | 1 - src/mainboard/asus/p8x7x-series/Kconfig | 1 - src/mainboard/foxconn/g41s-k/Kconfig | 1 - src/mainboard/gigabyte/ga-b75m-d3h/Kconfig | 1 - src/mainboard/gigabyte/ga-h61m-series/Kconfig | 1 - src/mainboard/google/auron/Kconfig | 1 - src/mainboard/google/brya/Kconfig | 1 - src/mainboard/google/cyan/Kconfig | 1 - src/mainboard/google/dedede/Kconfig | 1 - src/mainboard/google/deltaur/Kconfig | 1 - src/mainboard/google/fizz/Kconfig | 1 - src/mainboard/google/glados/Kconfig | 1 - src/mainboard/google/guybrush/Kconfig | 1 - src/mainboard/google/hatch/Kconfig | 1 - src/mainboard/google/mancomb/Kconfig | 1 - src/mainboard/google/octopus/Kconfig | 1 - src/mainboard/google/rambi/Kconfig | 1 - src/mainboard/google/slippy/Kconfig | 1 - src/mainboard/google/volteer/Kconfig | 1 - src/mainboard/google/zork/Kconfig | 1 - src/mainboard/hp/snb_ivb_laptops/Kconfig | 1 - src/mainboard/intel/adlrvp/Kconfig | 1 - src/mainboard/intel/coffeelake_rvp/Kconfig | 1 - src/mainboard/intel/kblrvp/Kconfig | 1 - src/mainboard/kontron/bsl6/Kconfig | 1 - src/mainboard/kontron/mal10/Kconfig | 1 - src/mainboard/lenovo/t400/Kconfig | 1 - src/mainboard/lenovo/t430s/Kconfig | 1 - src/mainboard/lenovo/t520/Kconfig | 1 - src/mainboard/lenovo/t530/Kconfig | 1 - src/mainboard/lenovo/t60/Kconfig | 1 - src/mainboard/lenovo/x200/Kconfig | 1 - src/mainboard/lenovo/x220/Kconfig | 1 - src/mainboard/lenovo/x230/Kconfig | 1 - src/mainboard/prodrive/hermes/Kconfig | 1 - src/mainboard/protectli/vault_bsw/Kconfig | 1 - src/mainboard/purism/librem_bdw/Kconfig | 1 - src/mainboard/purism/librem_skl/Kconfig | 1 - src/mainboard/supermicro/x11-lga1151-series/Kconfig | 1 - src/mainboard/system76/whl-u/Kconfig | 1 - 42 files changed, 42 deletions(-) diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig index 125460bf58..362546e999 100644 --- a/src/mainboard/asus/h61-series/Kconfig +++ b/src/mainboard/asus/h61-series/Kconfig @@ -33,7 +33,6 @@ config MAINBOARD_PART_NUMBER default "P8H61-M PRO CM6630" if BOARD_ASUS_P8H61_M_PRO_CM6630 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config CMOS_DEFAULT_FILE diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index 9e70cb8112..8f3eb6723a 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -46,7 +46,6 @@ config VARIANT_DIR default "p3b-f" if BOARD_ASUS_P3B_F config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config IRQ_SLOT_COUNT diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig index 74dfecb576..e54809ccf4 100644 --- a/src/mainboard/asus/p5qpl-am/Kconfig +++ b/src/mainboard/asus/p5qpl-am/Kconfig @@ -32,7 +32,6 @@ config MAINBOARD_PART_NUMBER default "P5G41T-M LX" if BOARD_ASUS_P5G41T_M_LX config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" # Override the default variant behavior, since the data.vbt is the same diff --git a/src/mainboard/asus/p8x7x-series/Kconfig b/src/mainboard/asus/p8x7x-series/Kconfig index e417ae6f04..1e725b204d 100644 --- a/src/mainboard/asus/p8x7x-series/Kconfig +++ b/src/mainboard/asus/p8x7x-series/Kconfig @@ -34,7 +34,6 @@ config MAINBOARD_PART_NUMBER default "P8Z77-V" if BOARD_ASUS_P8Z77_V config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config CMOS_DEFAULT_FILE diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig index cf218a40c4..c5a0642cd3 100644 --- a/src/mainboard/foxconn/g41s-k/Kconfig +++ b/src/mainboard/foxconn/g41s-k/Kconfig @@ -29,7 +29,6 @@ config MAINBOARD_PART_NUMBER default "G41M/G41M-S/G41M-V" if BOARD_FOXCONN_G41M config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_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 0a27949cb3..d2c501e58f 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -40,7 +40,6 @@ config MAINBOARD_PART_NUMBER default "GA-B75-D3V" if BOARD_GIGABYTE_GA_B75_D3V config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V # Override the default variant behavior, since the data.vbt is the same diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig index 66228aa3bc..d9d7787966 100644 --- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig +++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig @@ -33,7 +33,6 @@ config MAINBOARD_PART_NUMBER default "GA-H61MA-D3V" if BOARD_GIGABYTE_GA_H61MA_D3V config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" # Override the default variant behavior, since the data.vbt is the same diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index c30c38accf..b1b4583f89 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -45,7 +45,6 @@ config MAINBOARD_PART_NUMBER default "Samus" if BOARD_GOOGLE_SAMUS config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config EC_GOOGLE_CHROMEEC_BOARDNAME diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 736c25c6b9..00d607c022 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -57,7 +57,6 @@ config TPM_TIS_ACPI_INTERRUPT default 13 # GPE0_DW0_13 (GPP_A13_IRQ) config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_DIR diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 22dedea16b..b237c2115c 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -68,7 +68,6 @@ config MAINBOARD_PART_NUMBER default "Wizpig" if BOARD_GOOGLE_WIZPIG config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config CBFS_SIZE diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 7cc66b02dc..189fa79cf3 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -118,7 +118,6 @@ config MAX_CPUS default 4 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_DEDEDE config UART_FOR_CONSOLE diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index 29975748d0..d40eebb4c2 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -48,7 +48,6 @@ config FMDFILE default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/chromeos.fmd" if BOARD_GOOGLE_DELTAUR config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config POWER_OFF_ON_CR50_UPDATE diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index f7216e16d9..5153441c56 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -33,7 +33,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config VBOOT diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index b1ec406a96..144dee31d5 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -60,7 +60,6 @@ config VARIANT_DIR default "sentry" if BOARD_GOOGLE_SENTRY config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config TPM_PIRQ diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig index 4fb7c5a35b..a0a18a01e2 100644 --- a/src/mainboard/google/guybrush/Kconfig +++ b/src/mainboard/google/guybrush/Kconfig @@ -110,7 +110,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_FAMILY diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 32e5aa5b2c..64ad91d542 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -137,7 +137,6 @@ config MAINBOARD_PART_NUMBER default "Scout" if BOARD_GOOGLE_SCOUT config OVERRIDE_DEVICETREE - string default "variants/helios_diskswap/overridetree.cb" if BOARD_GOOGLE_HELIOS_DISKSWAP default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" diff --git a/src/mainboard/google/mancomb/Kconfig b/src/mainboard/google/mancomb/Kconfig index b29d13cb7e..82c08fdbb8 100644 --- a/src/mainboard/google/mancomb/Kconfig +++ b/src/mainboard/google/mancomb/Kconfig @@ -92,7 +92,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_FAMILY diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index d0b47cd7f2..4caf5a022a 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -71,7 +71,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" if !BOARD_GOOGLE_OCTOPUS config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 749548edde..2c1b040f8c 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -64,7 +64,6 @@ config MAINBOARD_PART_NUMBER default "Winky" if BOARD_GOOGLE_WINKY config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config EC_GOOGLE_CHROMEEC_BOARDNAME diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 9b36cc9181..c69a73a465 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -47,7 +47,6 @@ config MAINBOARD_FAMILY default "Google_Slippy" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config VGA_BIOS_FILE diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index ad532ddf87..e26070fcb3 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -65,7 +65,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config DRIVER_TPM_SPI_BUS diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 9ff4318676..aa9c826b96 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -94,7 +94,6 @@ config DEVICETREE default "variants/baseboard/devicetree_dalboz.cb" if BOARD_GOOGLE_BASEBOARD_DALBOZ config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_FAMILY diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig index 65741b2086..583fd4b649 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig @@ -43,7 +43,6 @@ config MAINBOARD_PART_NUMBER default "EliteBook Revolve 810 G1" if BOARD_HP_REVOLVE_810_G1 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config VGA_BIOS_FILE diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig index 812f68db89..608b8da3bb 100644 --- a/src/mainboard/intel/adlrvp/Kconfig +++ b/src/mainboard/intel/adlrvp/Kconfig @@ -63,7 +63,6 @@ config DEVICETREE default "devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config DIMM_SPD_SIZE diff --git a/src/mainboard/intel/coffeelake_rvp/Kconfig b/src/mainboard/intel/coffeelake_rvp/Kconfig index 14519310cc..76b71aba1a 100644 --- a/src/mainboard/intel/coffeelake_rvp/Kconfig +++ b/src/mainboard/intel/coffeelake_rvp/Kconfig @@ -58,7 +58,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config FMDFILE diff --git a/src/mainboard/intel/kblrvp/Kconfig b/src/mainboard/intel/kblrvp/Kconfig index 043dfa6a23..5a4598b20a 100644 --- a/src/mainboard/intel/kblrvp/Kconfig +++ b/src/mainboard/intel/kblrvp/Kconfig @@ -49,7 +49,6 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config IFD_BIN_PATH diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig index a6331f4b02..d79f374e7b 100644 --- a/src/mainboard/kontron/bsl6/Kconfig +++ b/src/mainboard/kontron/bsl6/Kconfig @@ -45,7 +45,6 @@ config VARIANT_DIR default "boxer26" if BOARD_SIEMENS_BOXER26 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config CBFS_SIZE diff --git a/src/mainboard/kontron/mal10/Kconfig b/src/mainboard/kontron/mal10/Kconfig index f69fdbec30..631dd76c89 100644 --- a/src/mainboard/kontron/mal10/Kconfig +++ b/src/mainboard/kontron/mal10/Kconfig @@ -49,7 +49,6 @@ config DEVICETREE default "variants/\$(CONFIG_VARIANT_DIR)/devicetree.cb" config OVERRIDE_DEVICETREE - string default "carriers/\$(CONFIG_CARRIER_DIR)/overridetree.cb" endif diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index 1ac1a35571..7b0ef7042e 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -63,7 +63,6 @@ config MAINBOARD_PART_NUMBER default "ThinkPad W500" if BOARD_LENOVO_W500 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config USBDEBUG_HCD_INDEX diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 8bdbab7391..6d0a1205f9 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -61,7 +61,6 @@ config MAINBOARD_PART_NUMBER default "ThinkPad T431s" if BOARD_LENOVO_T431S config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config USBDEBUG_HCD_INDEX diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 91e9d27f18..2602309a9b 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -51,7 +51,6 @@ config MAINBOARD_DIR default "lenovo/t520" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config FMDFILE diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 7782b1ac32..597ea1dc5b 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -56,7 +56,6 @@ config MAINBOARD_DIR default "lenovo/t530" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 9cb7ab8fd6..80e9c0ee1c 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -32,7 +32,6 @@ config VARIANT_DIR default "z61t" if BOARD_LENOVO_Z61T config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 4573995f3e..ffb7bb6435 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -55,7 +55,6 @@ config MAINBOARD_PART_NUMBER default "ThinkPad X301" if BOARD_LENOVO_X301 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config USBDEBUG_HCD_INDEX diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 763a5aff8c..0b3ee00b20 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -59,7 +59,6 @@ config MAINBOARD_PART_NUMBER default "ThinkPad X1" if BOARD_LENOVO_X1 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config USBDEBUG_HCD_INDEX diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 2df21f9e47..e334518b90 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -62,7 +62,6 @@ config MAINBOARD_PART_NUMBER default "ThinkPad X230s" if BOARD_LENOVO_X230S config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config USBDEBUG_HCD_INDEX diff --git a/src/mainboard/prodrive/hermes/Kconfig b/src/mainboard/prodrive/hermes/Kconfig index f62803c383..55fc780757 100644 --- a/src/mainboard/prodrive/hermes/Kconfig +++ b/src/mainboard/prodrive/hermes/Kconfig @@ -53,7 +53,6 @@ config MAX_CPUS default 16 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config CONSOLE_POST diff --git a/src/mainboard/protectli/vault_bsw/Kconfig b/src/mainboard/protectli/vault_bsw/Kconfig index 23d0e1c33b..f328d3d6dc 100644 --- a/src/mainboard/protectli/vault_bsw/Kconfig +++ b/src/mainboard/protectli/vault_bsw/Kconfig @@ -22,7 +22,6 @@ config VARIANT_DIR default "fw4b" if BOARD_PROTECTLI_FW4B config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_PART_NUMBER diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index c980e2a6a1..a5898cb303 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -18,7 +18,6 @@ config VARIANT_DIR default "librem15v2" if BOARD_PURISM_LIBREM15_V2 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config DRIVERS_UART_8250IO diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index 0e55a344af..191ca6ef79 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -42,7 +42,6 @@ config MAINBOARD_DIR default "purism/librem_skl" config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config VGA_BIOS_ID diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig index df864a2e7a..08cb3fbf44 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig +++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig @@ -37,7 +37,6 @@ config VARIANT_DIR default "x11ssh-f" if BOARD_SUPERMICRO_X11SSH_F config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config VBOOT diff --git a/src/mainboard/system76/whl-u/Kconfig b/src/mainboard/system76/whl-u/Kconfig index 350a2dd468..2493d745f0 100644 --- a/src/mainboard/system76/whl-u/Kconfig +++ b/src/mainboard/system76/whl-u/Kconfig @@ -30,7 +30,6 @@ config VARIANT_DIR default "darp5" if BOARD_SYSTEM76_DARP5 config OVERRIDE_DEVICETREE - string default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" config MAINBOARD_PART_NUMBER