Intel D945GCLF: Enable SMI and ACPI in Kconfig, too (it's enabled in newconfig)

and guard SMI specific parts of the ACPI code.
(trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5018 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2010-01-16 16:39:50 +00:00 committed by Stefan Reinauer
parent 38c9965977
commit f2da0d5654
2 changed files with 6 additions and 2 deletions

View File

@ -31,8 +31,8 @@ config BOARD_INTEL_D945GCLF
select USE_PRINTK_IN_CAR select USE_PRINTK_IN_CAR
select AP_IN_SIPI_WAIT select AP_IN_SIPI_WAIT
select UDELAY_LAPIC select UDELAY_LAPIC
#select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
#select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR config MAINBOARD_DIR

View File

@ -192,7 +192,9 @@ unsigned long acpi_fill_srat(unsigned long current)
return current; return current;
} }
#if CONFIG_HAVE_SMI_HANDLER
void smm_setup_structures(void *gnvs, void *tcg, void *smi1); void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
#endif
#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) #define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
unsigned long write_acpi_tables(unsigned long start) unsigned long write_acpi_tables(unsigned long start)
@ -311,8 +313,10 @@ unsigned long write_acpi_tables(unsigned long start)
current += 0x100; current += 0x100;
ALIGN_CURRENT; ALIGN_CURRENT;
#if CONFIG_HAVE_SMI_HANDLER
/* And tell SMI about it */ /* And tell SMI about it */
smm_setup_structures((void *)current, NULL, NULL); smm_setup_structures((void *)current, NULL, NULL);
#endif
/* We patched up the DSDT, so we need to recalculate the checksum */ /* We patched up the DSDT, so we need to recalculate the checksum */
dsdt->checksum = 0; dsdt->checksum = 0;