[v2] r4669 - in trunk/coreboot-v2/src/mainboard: . asus/mew-vm

Author: uwe
Date: 2009-09-24 16:05:19 +0200 (Thu, 24 Sep 2009)
New Revision: 4669

Modified:
   trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc
   trunk/coreboot-v2/src/mainboard/asus/mew-vm/Kconfig
Log:
Re-enable option table for the ASUS MEW-VM and fix build.

Signed-off-by: Uwe Hermann 
Acked-by: Patrick Georgi

Modified: trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc	2009-09-24 12:17:07 UTC (rev 4668)
+++ trunk/coreboot-v2/src/mainboard/Makefile.romccboard.inc	2009-09-24 14:05:19 UTC (rev 4669)
@@ -47,7 +47,7 @@
 $(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib/failover.c
    $(obj)/romcc -mcpu=p2 -O2 --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@

-ifeq ($(HAVE_OPTION_TABLE),y)
+ifeq ($(CONFIG_HAVE_OPTION_TABLE),y)
 $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h
    $(obj)/romcc -mcpu=p2 -O2 $(INCLUDES) $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
 else

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-vm/Kconfig	2009-09-24 12:17:07 UTC (rev 4668)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/Kconfig	2009-09-24 14:05:19 UTC (rev 4669)
@@ -42,11 +42,6 @@
    default "MEW-VM"
    depends on BOARD_ASUS_MEW_VM

-config HAVE_OPTION_TABLE
-	bool
-	default n
-	depends on BOARD_ASUS_MEW_VM
-
 config IRQ_SLOT_COUNT
    int
    default 11