This patch cleans up mpspec.h and allows it to be included when
HAVE_MP_TABLE=0
It also removes the artifacts from the Asus m2v-mx_se that were
necessary before the change.
Signed-off-by: Myles Watson <[email protected]>
Thanks,
Myles
Index: svn/src/mainboard/asus/m2v-mx_se/Config.lb
===================================================================
--- svn.orig/src/mainboard/asus/m2v-mx_se/Config.lb
+++ svn/src/mainboard/asus/m2v-mx_se/Config.lb
@@ -51,9 +51,6 @@ if HAVE_ACPI_TABLES
end
object ./dsdt.o
end
-if HAVE_MP_TABLE object mptable.o end
-if HAVE_PIRQ_TABLE object irq_tables.o end
-# object reset.o
if CONFIG_USE_INIT
makerule ./cache_as_ram_auto.o
Index: svn/src/mainboard/asus/m2v-mx_se/Options.lb
===================================================================
--- svn.orig/src/mainboard/asus/m2v-mx_se/Options.lb
+++ svn/src/mainboard/asus/m2v-mx_se/Options.lb
@@ -103,7 +103,7 @@ default HAVE_FALLBACK_BOOT = 1
default HAVE_HARD_RESET = 1
default HAVE_PIRQ_TABLE = 0
default IRQ_SLOT_COUNT = 11 # FIXME?
-default HAVE_MP_TABLE = 1
+default HAVE_MP_TABLE = 0
default HAVE_OPTION_TABLE = 0 # FIXME
# Move the default coreboot CMOS range off of AMD RTC registers.
default LB_CKS_RANGE_START = 49
Index: svn/src/arch/i386/include/arch/smp/mpspec.h
===================================================================
--- svn.orig/src/arch/i386/include/arch/smp/mpspec.h
+++ svn/src/arch/i386/include/arch/smp/mpspec.h
@@ -1,8 +1,6 @@
#ifndef __ASM_MPSPEC_H
#define __ASM_MPSPEC_H
-#if HAVE_MP_TABLE==1
-
/*
* Structure definitions for SMP machines following the
* Intel Multiprocessing Specification 1.1 and 1.4.
@@ -272,16 +270,5 @@ void *smp_write_floating_table_physaddr(
unsigned long mpf_physptr);
unsigned long write_smp_table(unsigned long addr);
-#else /* HAVE_MP_TABLE */
-#if 0
-static inline
-unsigned long write_smp_table(unsigned long addr)
-{
- return addr;
-}
-#endif
-#define write_smp_table(addr) (addr)
-#endif /* HAVE_MP_TABLE */
-
#endif
Index: svn/src/mainboard/asus/m2v-mx_se/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/m2v-mx_se/mptable.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Rudolf Marek <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License v2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <string.h>
-#include <stdint.h>
-#include <arch/smp/mpspec.h>
-#include <../../../southbridge/via/vt8237r/vt8237r.h>
-#include <../../../southbridge/via/k8t890/k8t890.h>
-
-unsigned long write_smp_table(unsigned long addr)
-{
- /* place holder for a table, need to have it defined because
- of MP_ used by ACPI */
-
- return addr;
-}
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
