[commit] r5018 - trunk/src/mainboard/intel/d945gclf

Author: stepan
Date: 2010-01-16 17:39:50 +0100 (Sat, 16 Jan 2010)
New Revision: 5018

Modified:
   trunk/src/mainboard/intel/d945gclf/Kconfig
   trunk/src/mainboard/intel/d945gclf/acpi_tables.c
Log:
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 
Acked-by: Stefan Reinauer

Modified: trunk/src/mainboard/intel/d945gclf/Kconfig
===================================================================
--- trunk/src/mainboard/intel/d945gclf/Kconfig	2010-01-16 16:37:27 UTC (rev 5017)
+++ trunk/src/mainboard/intel/d945gclf/Kconfig	2010-01-16 16:39:50 UTC (rev 5018)
@@ -31,8 +31,8 @@
    select USE_PRINTK_IN_CAR
    select AP_IN_SIPI_WAIT
    select UDELAY_LAPIC
-	#select HAVE_ACPI_TABLES
-	#select HAVE_SMI_HANDLER
+	select HAVE_ACPI_TABLES
+	select HAVE_SMI_HANDLER
    select BOARD_ROMSIZE_KB_1024

config MAINBOARD_DIR

Modified: trunk/src/mainboard/intel/d945gclf/acpi_tables.c
===================================================================
--- trunk/src/mainboard/intel/d945gclf/acpi_tables.c	2010-01-16 16:37:27 UTC (rev 5017)
+++ trunk/src/mainboard/intel/d945gclf/acpi_tables.c	2010-01-16 16:39:50 UTC (rev 5018)
@@ -192,7 +192,9 @@
    return current;
 }

+#if CONFIG_HAVE_SMI_HANDLER
 void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
+#endif

#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10)
 unsigned long write_acpi_tables(unsigned long start)
@@ -311,8 +313,10 @@
    current += 0x100;
    ALIGN_CURRENT;

+#if CONFIG_HAVE_SMI_HANDLER
    /* And tell SMI about it */
    smm_setup_structures((void *)current, NULL, NULL);
+#endif

/* We patched up the DSDT, so we need to recalculate the checksum */
    dsdt->checksum = 0;