summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2015-06-27 08:59:10 -0600
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-07-02 02:17:27 +0200
commitc528c2e3e9f9e87522ab5b1cd61e67e1dec606ce (patch)
treeaeb1ac752c6cdef2b29a47a870a52f8a8151be2a
parent0ab2b25f01f7e2cbfcd632f8d78b969b79a534d8 (diff)
downloadcoreboot-c528c2e3e9f9e87522ab5b1cd61e67e1dec606ce.tar.xz
Intel Firmware Descriptor Kconfig: remove USES_INTEL_ME
When I added the common IFD Kconfig and Makefile, My thinking was that I could use this symbol to differentiate between the ME and the TXE, and to exclude the ME questions from platforms that use the IFD, but don't use an ME, like Rangeley. In practice this made things a lot more complicated and isn't worth it. Change-Id: I4428744e53c6bb7fc00a4fa4f0aa782c25fc9013 Signed-off-by: Martin Roth <gaumless@gmail.com> Reviewed-on: http://review.coreboot.org/10678 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/southbridge/intel/common/firmware/Kconfig3
-rw-r--r--src/southbridge/intel/fsp_bd82x6x/Kconfig1
-rw-r--r--src/southbridge/intel/lynxpoint/Kconfig1
3 files changed, 1 insertions, 4 deletions
diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index 1f4d935f7c..71434ac0eb 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -39,7 +39,7 @@ config IFD_BIN_PATH
config HAVE_ME_BIN
bool "Add Intel Management Engine firmware"
- depends on USES_INTEL_ME && HAVE_IFD_BIN
+ depends on HAVE_IFD_BIN
help
The Intel processor in the selected system requires a special firmware
for an integrated controller called Management Engine (ME). The ME
@@ -90,5 +90,4 @@ config IFD_PLATFORM_SECTION
string
default ""
-
endif #INTEL_FIRMWARE
diff --git a/src/southbridge/intel/fsp_bd82x6x/Kconfig b/src/southbridge/intel/fsp_bd82x6x/Kconfig
index fc2b6b36a2..85c6ee7862 100644
--- a/src/southbridge/intel/fsp_bd82x6x/Kconfig
+++ b/src/southbridge/intel/fsp_bd82x6x/Kconfig
@@ -34,7 +34,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select SPI_FLASH
select COMMON_FADT
select HAVE_INTEL_FIRMWARE
- select USES_INTEL_ME
config EHCI_BAR
hex
diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig
index 2c71ab2a53..3c8ae115e5 100644
--- a/src/southbridge/intel/lynxpoint/Kconfig
+++ b/src/southbridge/intel/lynxpoint/Kconfig
@@ -33,7 +33,6 @@ config SOUTH_BRIDGE_OPTIONS # dummy
select PCIEXP_COMMON_CLOCK
select SPI_FLASH
select HAVE_INTEL_FIRMWARE
- select USES_INTEL_ME
config INTEL_LYNXPOINT_LP
bool