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>
This commit is contained in:
Martin Roth 2015-08-25 17:04:59 -06:00
parent 3f2a945fb8
commit 4a666423c6
3 changed files with 1 additions and 6 deletions

View File

@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_RAM_SETUP
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select IOMMU
select VGA select VGA
select INTEL_EDID select INTEL_EDID
select INTEL_GMA_ACPI select INTEL_GMA_ACPI

View File

@ -31,7 +31,7 @@ romstage-y += thermal.c
romstage-y += igd.c romstage-y += igd.c
romstage-y += pm.c romstage-y += pm.c
romstage-y += ram_calc.c romstage-y += ram_calc.c
romstage-$(CONFIG_IOMMU) += iommu.c romstage-y += iommu.c
ramstage-y += acpi.c ramstage-y += acpi.c

View File

@ -114,20 +114,16 @@ unsigned long northbridge_write_acpi_tables(device_t device,
struct acpi_rsdp *rsdp) struct acpi_rsdp *rsdp)
{ {
unsigned long current; unsigned long current;
#if CONFIG_IOMMU
acpi_dmar_t *dmar; acpi_dmar_t *dmar;
#endif
current = start; current = start;
#if CONFIG_IOMMU
printk(BIOS_DEBUG, "ACPI: * DMAR\n"); printk(BIOS_DEBUG, "ACPI: * DMAR\n");
dmar = (acpi_dmar_t *) current; dmar = (acpi_dmar_t *) current;
acpi_create_dmar(dmar, acpi_fill_dmar); acpi_create_dmar(dmar, acpi_fill_dmar);
current += dmar->header.length; current += dmar->header.length;
ALIGN_CURRENT; ALIGN_CURRENT;
acpi_add_table(rsdp, dmar); acpi_add_table(rsdp, dmar);
#endif
ALIGN_CURRENT; ALIGN_CURRENT;