diff options
| author | Martin Roth <martinroth@google.com> | 2015-08-25 17:04:59 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-08-31 22:02:17 +0000 |
| commit | 4a666423c6d71614b7c2b539afa33d823c1896d5 (patch) | |
| tree | e6a4cf7d66d75c4cc74f53f738b02a0f57eb2ce3 /src/northbridge | |
| parent | 3f2a945fb8a87c328205f5c8854489c475a41a43 (diff) | |
northbridge/intel/gm45/Kconfig: Remove IOMMU symbol choice
In the gm45 code, IOMMU is always selected to be enabled. Instead
this patch removes the Kconfig symbol and its dependencies. This leads
to the same effect without the need for the symbol.
The symbol is still used in the K8 code as it's not selected, simply
defaulted to being enabled, and one of the mainboards disables it.
Change-Id: Ibc5939cd1e297d497bf71b1787d852f7cc09a551
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/11345
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/intel/gm45/Kconfig | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/gm45/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/northbridge/intel/gm45/acpi.c | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig index 2374a1f150..a85cde2704 100644 --- a/src/northbridge/intel/gm45/Kconfig +++ b/src/northbridge/intel/gm45/Kconfig @@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy select HAVE_DEBUG_RAM_SETUP select MMCONF_SUPPORT select MMCONF_SUPPORT_DEFAULT - select IOMMU select VGA select INTEL_EDID select INTEL_GMA_ACPI diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc index 4050296c31..8bb083a0df 100644 --- a/src/northbridge/intel/gm45/Makefile.inc +++ b/src/northbridge/intel/gm45/Makefile.inc @@ -31,7 +31,7 @@ romstage-y += thermal.c romstage-y += igd.c romstage-y += pm.c romstage-y += ram_calc.c -romstage-$(CONFIG_IOMMU) += iommu.c +romstage-y += iommu.c ramstage-y += acpi.c diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c index daa5aedf15..b1cb77314c 100644 --- a/src/northbridge/intel/gm45/acpi.c +++ b/src/northbridge/intel/gm45/acpi.c @@ -114,20 +114,16 @@ unsigned long northbridge_write_acpi_tables(device_t device, struct acpi_rsdp *rsdp) { unsigned long current; -#if CONFIG_IOMMU acpi_dmar_t *dmar; -#endif current = start; -#if CONFIG_IOMMU printk(BIOS_DEBUG, "ACPI: * DMAR\n"); dmar = (acpi_dmar_t *) current; acpi_create_dmar(dmar, acpi_fill_dmar); current += dmar->header.length; ALIGN_CURRENT; acpi_add_table(rsdp, dmar); -#endif ALIGN_CURRENT; |