I wanted to compile without an mptable for debugging, but it wasn't as
easy as I'd hoped. This makes it easier.
Since the asus/m2v_mx_se doesn't need mptables, remove mptable.c now
that it compiles without it.
Build tested.
Signed-off-by: Myles Watson <[email protected]>
Thanks,
Myles
Index: svn/src/arch/i386/boot/tables.c
===================================================================
--- svn.orig/src/arch/i386/boot/tables.c
+++ svn/src/arch/i386/boot/tables.c
@@ -122,6 +122,8 @@ struct lb_memory *write_tables(void)
/* copy the smp block to address 0 */
post_code(0x96);
+#if HAVE_MP_TABLE == 1
+
/* The smp table must be in 0-1K, 639K-640K, or 960K-1M */
#if HAVE_LOW_TABLES == 1
new_low_table_end = write_smp_table(low_table_end); // low_table_end is 0x10 at this point
@@ -133,7 +135,6 @@ struct lb_memory *write_tables(void)
}
#endif
-#if HAVE_MP_TABLE == 1
/* Don't write anything in the traditional x86 BIOS data segment,
* for example the linux kernel smp need to use 0x467 to pass reset vector
* or use 0x40e/0x413 for EBDA finding...
@@ -160,7 +161,7 @@ struct lb_memory *write_tables(void)
smp_write_floating_table_physaddr(low_table_end - SMP_FLOATING_TABLE_LEN, mpc_start);
memset((unsigned char *)low_table_end, '\0', mptable_size);
}
-#endif
+#endif /* HAVE_MP_TABLE */
if (low_table_end < 0x500) {
low_table_end = 0x500;
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
@@ -50,9 +50,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 USE_DCACHE_RAM
if CONFIG_USE_INIT
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;
-}
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
@@ -99,7 +99,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
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
