Patchwork linker problem after menuconfig

login
register
about
Submitter Myles Watson
Date 2010-08-02 13:59:17
Message ID <AANLkTiksRECiF91-60YSX8vU56fcraFkP260QZtjxCBT@mail.gmail.com>
Download mbox | patch
Permalink /patch/1711/
State Accepted
Headers show

Comments

Myles Watson - 2010-08-02 13:59:17
On Sun, Aug 1, 2010 at 7:43 PM,  <austinro@msu.edu> wrote:
> Okay, I found the problem.  CONFIG_VGA_BRIDGE_SETUP builds vga.c, which
> needs mainboard_interrupt_handlers from devices/oprom/x86.c, which wasn't
> being built unless one of the *_ROM_RUN files were enabled.

I think you really wanted to disable the building of vga.c.  There's
no need for it if SeaBIOS handles the option ROMs.

Patch attached.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Kevin O'Connor - 2010-08-02 15:09:31
On Mon, Aug 02, 2010 at 07:59:17AM -0600, Myles Watson wrote:
> On Sun, Aug 1, 2010 at 7:43 PM,  <austinro@msu.edu> wrote:
> > Okay, I found the problem.  CONFIG_VGA_BRIDGE_SETUP builds vga.c, which
> > needs mainboard_interrupt_handlers from devices/oprom/x86.c, which wasn't
> > being built unless one of the *_ROM_RUN files were enabled.
> 
> I think you really wanted to disable the building of vga.c.  There's
> no need for it if SeaBIOS handles the option ROMs.
> 
> Patch attached.
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

Works for me!

Acked by: Kevin O'Connor <kevin@koconnor.net>

-Kevin
Myles Watson - 2010-08-02 15:14:48
>> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Works for me!
>
> Acked by: Kevin O'Connor <kevin@koconnor.net>
Rev 5680.

Thanks,
Myles

Patch

Index: svn/src/northbridge/intel/i82830/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/intel/i82830/Makefile.inc
+++ svn/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@ 
 driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
 
 smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.o
Index: svn/src/northbridge/via/cn400/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/via/cn400/Makefile.inc
+++ svn/src/northbridge/via/cn400/Makefile.inc
@@ -20,6 +20,6 @@ 
 
 driver-y += northbridge.o
 driver-y += agp.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
 driver-y += vlink.o
 
Index: svn/src/northbridge/via/cn700/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/via/cn700/Makefile.inc
+++ svn/src/northbridge/via/cn700/Makefile.inc
@@ -20,5 +20,5 @@ 
 
 driver-y += northbridge.o
 driver-y += agp.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
 
Index: svn/src/northbridge/via/cx700/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/via/cx700/Makefile.inc
+++ svn/src/northbridge/via/cx700/Makefile.inc
@@ -23,4 +23,4 @@  obj-y += northbridge.o
 driver-y += cx700_agp.o
 driver-y += cx700_lpc.o
 driver-y += cx700_sata.o
-driver-y += cx700_vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += cx700_vga.o
Index: svn/src/northbridge/via/vt8623/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/via/vt8623/Makefile.inc
+++ svn/src/northbridge/via/vt8623/Makefile.inc
@@ -19,5 +19,5 @@ 
 ##
 
 driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
 
Index: svn/src/northbridge/via/vx800/Makefile.inc
===================================================================
--- svn.orig/src/northbridge/via/vx800/Makefile.inc
+++ svn/src/northbridge/via/vx800/Makefile.inc
@@ -19,7 +19,7 @@ 
 ##
 
 driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
 driver-y += vx800_lpc.o
 driver-y += vx800_ide.o
 
Index: svn/src/southbridge/amd/cs5530/Makefile.inc
===================================================================
--- svn.orig/src/southbridge/amd/cs5530/Makefile.inc
+++ svn/src/southbridge/amd/cs5530/Makefile.inc
@@ -21,5 +21,5 @@ 
 driver-y += cs5530.o
 driver-y += cs5530_isa.o
 driver-y += cs5530_ide.o
-driver-y += cs5530_vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += cs5530_vga.o
 driver-y += cs5530_pirq.o