From cea849328599c98219ff78cfb83083573aa80f77 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Sun, 24 Jun 2018 14:13:53 +0200 Subject: [PATCH] southbridge/intel/bd82x6x/Kconfig: Do not include any IFD by default Since only a handful of boards have descriptor blobs in the tree, it makes no sense to have `HAVE_IFD_BIN` enabled by default then disabled on each mainboard. This patch flips the default value of said variable, rendering all current overrides unnecessary. The few boards which have an IFD in the blobs repo use `select HAVE_IFD_BIN` to enable adding the IFD by default. Since `HAVE_ME_BIN` depends on `HAVE_IFD_BIN`, the former has been removed alongside the latter, and has been added to the boards with a ME blob as `select HAVE_ME_BIN`. Both `HAVE_IFD_BIN` and `HAVE_ME_BIN` have been removed from autoport as well. Change-Id: I330c4886f8bea4b1a8ecad6505a0e5cc381654d1 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/27218 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/apple/macbookair4_2/Kconfig | 8 -------- src/mainboard/asrock/b75pro3-m/Kconfig | 8 -------- src/mainboard/asus/maximus_iv_gene-z/Kconfig | 4 ---- src/mainboard/asus/p8h61-m_lx/Kconfig | 4 ---- src/mainboard/asus/p8h61-m_pro/Kconfig | 4 ---- src/mainboard/compulab/intense_pc/Kconfig | 12 ------------ src/mainboard/gigabyte/ga-b75m-d3h/Kconfig | 8 -------- src/mainboard/gigabyte/ga-b75m-d3v/Kconfig | 8 -------- src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig | 8 -------- src/mainboard/google/butterfly/Kconfig | 2 ++ src/mainboard/google/link/Kconfig | 2 ++ src/mainboard/google/parrot/Kconfig | 2 ++ src/mainboard/google/stout/Kconfig | 2 ++ src/mainboard/hp/2570p/Kconfig | 8 -------- src/mainboard/hp/2760p/Kconfig | 8 -------- src/mainboard/hp/8460p/Kconfig | 8 -------- src/mainboard/hp/8470p/Kconfig | 8 -------- src/mainboard/hp/8770w/Kconfig | 8 -------- src/mainboard/hp/compaq_8200_elite_sff/Kconfig | 8 -------- src/mainboard/hp/folio_9470m/Kconfig | 8 -------- src/mainboard/hp/revolve_810_g1/Kconfig | 8 -------- src/mainboard/intel/dcp847ske/Kconfig | 8 -------- src/mainboard/intel/emeraldlake2/Kconfig | 2 ++ src/mainboard/kontron/ktqm77/Kconfig | 12 ------------ src/mainboard/lenovo/l520/Kconfig | 8 -------- src/mainboard/lenovo/s230u/Kconfig | 8 -------- src/mainboard/lenovo/t420/Kconfig | 8 -------- src/mainboard/lenovo/t420s/Kconfig | 8 -------- src/mainboard/lenovo/t430/Kconfig | 8 -------- src/mainboard/lenovo/t430s/Kconfig | 8 -------- src/mainboard/lenovo/t520/Kconfig | 8 -------- src/mainboard/lenovo/t530/Kconfig | 8 -------- src/mainboard/lenovo/x131e/Kconfig | 4 ---- src/mainboard/lenovo/x1_carbon_gen1/Kconfig | 8 -------- src/mainboard/lenovo/x220/Kconfig | 8 -------- src/mainboard/lenovo/x230/Kconfig | 8 -------- src/mainboard/roda/rv11/Kconfig | 12 ------------ src/mainboard/samsung/lumpy/Kconfig | 2 ++ src/mainboard/samsung/stumpy/Kconfig | 2 ++ src/mainboard/sapphire/pureplatinumh61/Kconfig | 4 ---- src/southbridge/intel/bd82x6x/Kconfig | 3 --- util/autoport/sandybridge.go | 3 --- 42 files changed, 14 insertions(+), 262 deletions(-) diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig index 347cba283f..7253e872b0 100644 --- a/src/mainboard/apple/macbookair4_2/Kconfig +++ b/src/mainboard/apple/macbookair4_2/Kconfig @@ -14,14 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOUTHBRIDGE_INTEL_BD82X6X select SYSTEM_TYPE_LAPTOP -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default apple/macbookair4_2 diff --git a/src/mainboard/asrock/b75pro3-m/Kconfig b/src/mainboard/asrock/b75pro3-m/Kconfig index 20ee9a754a..af2bd10b1e 100644 --- a/src/mainboard/asrock/b75pro3-m/Kconfig +++ b/src/mainboard/asrock/b75pro3-m/Kconfig @@ -30,14 +30,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LIBGFXINIT select DRIVERS_ASMEDIA_ASPM_BLACKLIST -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default asrock/b75pro3-m diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig index eacf92e68f..13fad2dbc1 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig +++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig @@ -32,10 +32,6 @@ config BOARD_SPECIFIC_OPTIONS select SUPERIO_NUVOTON_NCT6776 select USE_NATIVE_RAMINIT -config HAVE_IFD_BIN - bool - default n - config MAINBOARD_DIR string default asus/maximus_iv_gene-z diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig index e3712f1c71..0960803546 100644 --- a/src/mainboard/asus/p8h61-m_lx/Kconfig +++ b/src/mainboard/asus/p8h61-m_lx/Kconfig @@ -36,10 +36,6 @@ config BOARD_SPECIFIC_OPTIONS select SUPERIO_NUVOTON_NCT6776_COM_A select USE_NATIVE_RAMINIT -config HAVE_IFD_BIN - bool - default n - config MAINBOARD_DIR string default asus/p8h61-m_lx diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig index cd01b0fe46..8fcc6509c8 100644 --- a/src/mainboard/asus/p8h61-m_pro/Kconfig +++ b/src/mainboard/asus/p8h61-m_pro/Kconfig @@ -32,10 +32,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_CMOS_DEFAULT select DRIVERS_ASMEDIA_ASPM_BLACKLIST -config HAVE_IFD_BIN - bool - default n - config MAINBOARD_DIR string default asus/p8h61-m_pro diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig index 557b8ff721..fccfb86f80 100644 --- a/src/mainboard/compulab/intense_pc/Kconfig +++ b/src/mainboard/compulab/intense_pc/Kconfig @@ -16,18 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select USE_NATIVE_RAMINIT select SUPERIO_SMSC_SIO1007 -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - -config HAVE_GBE_BIN - bool - default n - config MAINBOARD_DIR string default compulab/intense_pc diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig index 580a9ad392..7ec9fe9172 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig @@ -47,14 +47,6 @@ config VGA_BIOS_FILE string default "pci8086,0162.rom" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00600000:0x007fffff" diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig index b8694f5a15..12b1844272 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig +++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig @@ -46,14 +46,6 @@ config VGA_BIOS_FILE string default "pci8086,0102.rom" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00600000:0x007fffff" diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig index 406d1ab772..a4595f53bf 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig @@ -33,14 +33,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default "gigabyte/ga-h61m-s2pv" diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 8323d7fcb7..7eca2e19ac 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_TPM1 select INTEL_INT15 select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1. + select HAVE_IFD_BIN + select HAVE_ME_BIN config VBOOT select VBOOT_VBNV_CMOS diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index b7f0c77796..18071cf2a9 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -18,6 +18,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select HAVE_LINEAR_FRAMEBUFFER if MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_LIBGFXINIT + select HAVE_IFD_BIN + select HAVE_ME_BIN config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 50f28e79e1..ebab7f4494 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select INTEL_INT15 + select HAVE_IFD_BIN + select HAVE_ME_BIN # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index ebec5a5167..bc9600087c 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_TPM1 select INTEL_INT15 select SANDYBRIDGE_IVYBRIDGE_LVDS + select HAVE_IFD_BIN + select HAVE_ME_BIN config VBOOT select VBOOT_VBNV_CMOS diff --git a/src/mainboard/hp/2570p/Kconfig b/src/mainboard/hp/2570p/Kconfig index dc9588b210..8cda10c62d 100644 --- a/src/mainboard/hp/2570p/Kconfig +++ b/src/mainboard/hp/2570p/Kconfig @@ -34,14 +34,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/2570p diff --git a/src/mainboard/hp/2760p/Kconfig b/src/mainboard/hp/2760p/Kconfig index 7adf209e75..3c7c55c8e2 100644 --- a/src/mainboard/hp/2760p/Kconfig +++ b/src/mainboard/hp/2760p/Kconfig @@ -34,14 +34,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/2760p diff --git a/src/mainboard/hp/8460p/Kconfig b/src/mainboard/hp/8460p/Kconfig index 1486659566..56f90b2fcd 100644 --- a/src/mainboard/hp/8460p/Kconfig +++ b/src/mainboard/hp/8460p/Kconfig @@ -37,14 +37,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/8460p diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig index 215786752f..54ebf14253 100644 --- a/src/mainboard/hp/8470p/Kconfig +++ b/src/mainboard/hp/8470p/Kconfig @@ -35,14 +35,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/8470p diff --git a/src/mainboard/hp/8770w/Kconfig b/src/mainboard/hp/8770w/Kconfig index c65030967c..4ba13ff308 100644 --- a/src/mainboard/hp/8770w/Kconfig +++ b/src/mainboard/hp/8770w/Kconfig @@ -33,14 +33,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_CMOS_DEFAULT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/8770w diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig index d347306eb8..5960f5538d 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig +++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig @@ -19,14 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LIBGFXINIT select INTEL_GMA_HAVE_VBT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/compaq_8200_elite_sff diff --git a/src/mainboard/hp/folio_9470m/Kconfig b/src/mainboard/hp/folio_9470m/Kconfig index 188f8d86b8..c68f1dc855 100644 --- a/src/mainboard/hp/folio_9470m/Kconfig +++ b/src/mainboard/hp/folio_9470m/Kconfig @@ -21,14 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LIBGFXINIT select GFX_GMA_INTERNAL_IS_LVDS -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/folio_9470m diff --git a/src/mainboard/hp/revolve_810_g1/Kconfig b/src/mainboard/hp/revolve_810_g1/Kconfig index 7816da5e25..c44fcd9f72 100644 --- a/src/mainboard/hp/revolve_810_g1/Kconfig +++ b/src/mainboard/hp/revolve_810_g1/Kconfig @@ -23,14 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LIBGFXINIT select GFX_GMA_INTERNAL_IS_LVDS -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default hp/revolve_810_g1 diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig index 1fd3d8cc80..ae93e9df79 100644 --- a/src/mainboard/intel/dcp847ske/Kconfig +++ b/src/mainboard/intel/dcp847ske/Kconfig @@ -25,14 +25,6 @@ config DISABLE_UART_ON_TESTPADS endmenu -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default intel/dcp847ske diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 66c8329468..13e4f5b719 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -11,6 +11,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_ACPI_RESUME select INTEL_INT15 + select HAVE_IFD_BIN + select HAVE_ME_BIN #select MAINBOARD_HAS_CHROMEOS config VBOOT diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig index 17c28032c5..10da8d1ab9 100644 --- a/src/mainboard/kontron/ktqm77/Kconfig +++ b/src/mainboard/kontron/ktqm77/Kconfig @@ -44,18 +44,6 @@ config MAINBOARD_VENDOR string default "Kontron" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - -config HAVE_GBE_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00580000:0x007fffff" diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index 20ed67ce9c..05174c2c6c 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -18,14 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SYSTEM_TYPE_LAPTOP select USE_NATIVE_RAMINIT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/l520 diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index 2c579b0183..01bc4b5c53 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -20,14 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_TPM1 select GENERIC_SPD_BIN -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/s230u diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 40fd213b5d..41c0d37c45 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -29,14 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/t420 diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index ae50975ada..8eb241adf2 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -25,14 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/t420s diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index f119def477..242412f43e 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -27,14 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select GFX_GMA_INTERNAL_IS_LVDS select INTEL_GMA_HAVE_VBT -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/t430 diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index a938dccec4..728dd5c9a1 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -27,14 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/t430s diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 824f299862..85dedb3133 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -25,14 +25,6 @@ config BOARD_LENOVO_BASEBOARD_T520 if BOARD_LENOVO_BASEBOARD_T520 -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config VARIANT_DIR string default "t520" if BOARD_LENOVO_T520 diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 0bbf941743..d107504b61 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -28,14 +28,6 @@ config BOARD_LENOVO_BASEBOARD_T530 if BOARD_LENOVO_BASEBOARD_T530 -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config VARIANT_DIR string default "t530" if BOARD_LENOVO_T530 diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 3cf3078a68..d88f313154 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -23,10 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select GFX_GMA_INTERNAL_IS_LVDS select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/x131e diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index d33018e976..9ffd4108c4 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -27,14 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/x1_carbon_gen1 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 54d3648225..a710c84eef 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -26,14 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/x220 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 29c0e7bd2f..2725dcda4e 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -27,14 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy # Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - config MAINBOARD_DIR string default lenovo/x230 diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig index 4f8a4382fe..4485aeeaea 100644 --- a/src/mainboard/roda/rv11/Kconfig +++ b/src/mainboard/roda/rv11/Kconfig @@ -43,18 +43,6 @@ config MAINBOARD_VENDOR string default "Roda" -config HAVE_IFD_BIN - bool - default n - -config HAVE_ME_BIN - bool - default n - -config HAVE_GBE_BIN - bool - default n - config IFD_BIOS_SECTION string default "0x00d80000:0x00ffffff" diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 80f5dabce4..9cb0e5fd8f 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_MEC1308 + select HAVE_IFD_BIN + select HAVE_ME_BIN # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index b15b4b61d1..f0ac4f7163 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F + select HAVE_IFD_BIN + select HAVE_ME_BIN # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig index 42cda6e833..a07617e70a 100644 --- a/src/mainboard/sapphire/pureplatinumh61/Kconfig +++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig @@ -17,10 +17,6 @@ config BOARD_SPECIFIC_OPTIONS select INTEL_INT15 select NO_UART_ON_SUPERIO -config HAVE_IFD_BIN - bool - default n - config MAINBOARD_DIR string default sapphire/pureplatinumh61 diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig index 9a70bf24ec..3033e20e5b 100644 --- a/src/southbridge/intel/bd82x6x/Kconfig +++ b/src/southbridge/intel/bd82x6x/Kconfig @@ -66,9 +66,6 @@ config HPET_MIN_TICKS hex default 0x80 -config HAVE_IFD_BIN - def_bool y - config BUILD_WITH_FAKE_IFD def_bool !HAVE_IFD_BIN diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go index e54e6a6087..cf2b85987c 100644 --- a/util/autoport/sandybridge.go +++ b/util/autoport/sandybridge.go @@ -119,9 +119,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) { KconfigBool["HAVE_ACPI_TABLES"] = true KconfigBool["HAVE_ACPI_RESUME"] = true - KconfigBool["HAVE_IFD_BIN"] = false - KconfigBool["HAVE_ME_BIN"] = false - KconfigInt["MAX_CPUS"] = 8 DSDTIncludes = append(DSDTIncludes, DSDTInclude{