From patchwork Thu Sep 24 12:52:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re-enable option table for the ASUS MEW-VM and fix build Date: Thu, 24 Sep 2009 12:52:41 -0000 From: Uwe Hermann X-Patchwork-Id: 291 Message-Id: <20090924125241.GA18588@greenwood> To: Patrick Georgi Cc: coreboot@coreboot.org On Thu, Sep 24, 2009 at 10:39:55AM +0200, Patrick Georgi wrote: > Hi, > > with this patch (and my previous one), all kconfig enabled boards build > for me. > > Changes this time: > - Fix for superio/smsc/lpc47b272 > - disable option table for asus/mew-vm > - change superio to use for compaq/deskpro_en_sff_p600 to be in line > with what newconfig/buildtarget does > > > Signed-off-by: Patrick Georgi This was r4666. Most of the patch looks good, but disabling HAVE_OPTION_TABLE is incorrect I think, as the board _does_ have a cmos.layout file. The bug which prevented a successful build was a typo in the Makefile. Attached patch should fix it. > Index: src/mainboard/compaq/deskpro_en_sff_p600/Kconfig > =================================================================== > --- src/mainboard/compaq/deskpro_en_sff_p600/Kconfig (Revision 4665) > +++ src/mainboard/compaq/deskpro_en_sff_p600/Kconfig (Arbeitskopie) > @@ -24,7 +24,8 @@ > select CPU_INTEL_SLOT_2 > select NORTHBRIDGE_INTEL_I440BX > select SOUTHBRIDGE_INTEL_I82371EB > - select SUPERIO_NSC_PC97307 > + # should be SUPERIO_NSC_PC97307! > + select SUPERIO_NSC_PC97317 > select HAVE_PIRQ_TABLE > select UDELAY_IO > select PCI_ROM_RUN Yep, the PC97307 doesn't properly build right now (if it ever did), will look into it. Uwe. Acked-by: Patrick Georgi Re-enable option table for the ASUS MEW-VM and fix build. Signed-off-by: Uwe Hermann Index: src/mainboard/Makefile.romccboard.inc =================================================================== --- src/mainboard/Makefile.romccboard.inc (Revision 4668) +++ src/mainboard/Makefile.romccboard.inc (Arbeitskopie) @@ -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 Index: src/mainboard/asus/mew-vm/Kconfig =================================================================== --- src/mainboard/asus/mew-vm/Kconfig (Revision 4668) +++ src/mainboard/asus/mew-vm/Kconfig (Arbeitskopie) @@ -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