Author: myles Date: Mon Aug 2 17:14:13 2010 New Revision: 5680 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5680
Log: Build VGA code conditionally to avoid errors when using SeaBIOS.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Kevin O'Connor kevin@koconnor.net
Modified: trunk/src/northbridge/intel/i82830/Makefile.inc trunk/src/northbridge/via/cn400/Makefile.inc trunk/src/northbridge/via/cn700/Makefile.inc trunk/src/northbridge/via/cx700/Makefile.inc trunk/src/northbridge/via/vt8623/Makefile.inc trunk/src/northbridge/via/vx800/Makefile.inc trunk/src/southbridge/amd/cs5530/Makefile.inc
Modified: trunk/src/northbridge/intel/i82830/Makefile.inc ============================================================================== --- trunk/src/northbridge/intel/i82830/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/intel/i82830/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -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
Modified: trunk/src/northbridge/via/cn400/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cn400/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/via/cn400/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -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
Modified: trunk/src/northbridge/via/cn700/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cn700/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/via/cn700/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -20,5 +20,5 @@
driver-y += northbridge.o driver-y += agp.o -driver-y += vga.o +driver-$(CONFIG_VGA_ROM_RUN) += vga.o
Modified: trunk/src/northbridge/via/cx700/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/cx700/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/via/cx700/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -23,4 +23,4 @@ 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
Modified: trunk/src/northbridge/via/vt8623/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/vt8623/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/via/vt8623/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -19,5 +19,5 @@ ##
driver-y += northbridge.o -driver-y += vga.o +driver-$(CONFIG_VGA_ROM_RUN) += vga.o
Modified: trunk/src/northbridge/via/vx800/Makefile.inc ============================================================================== --- trunk/src/northbridge/via/vx800/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/northbridge/via/vx800/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -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
Modified: trunk/src/southbridge/amd/cs5530/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/cs5530/Makefile.inc Mon Aug 2 04:34:20 2010 (r5679) +++ trunk/src/southbridge/amd/cs5530/Makefile.inc Mon Aug 2 17:14:13 2010 (r5680) @@ -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
On 8/2/10 5:14 PM, repository service wrote:
Author: myles Date: Mon Aug 2 17:14:13 2010 New Revision: 5680 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5680
Log: Build VGA code conditionally to avoid errors when using SeaBIOS.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Kevin O'Connor kevin@koconnor.net
Modified: trunk/src/northbridge/intel/i82830/Makefile.inc trunk/src/northbridge/via/cn400/Makefile.inc trunk/src/northbridge/via/cn700/Makefile.inc trunk/src/northbridge/via/cx700/Makefile.inc trunk/src/northbridge/via/vt8623/Makefile.inc trunk/src/northbridge/via/vx800/Makefile.inc trunk/src/southbridge/amd/cs5530/Makefile.inc
I'm not too happy with this change.
- cs5530 is not using the option rom init code at all but does a lot of other things (that might be needed as a prerequisite for running SeaBIOS) - the change definitely breaks the i82830 MBI code - vga init on cn400 sets the framebuffer size in addition to calling the vga option rom (plus a lot of other things) - vga init on cn700 sets the framebuffer size in addition to calling the vga option rom (plus a lot of other things) - vt8623 does some "random fixup" too.
So I assume at least some of the targets will not behave correctly anymore when VGA oproms are disabled (and implicitly not executing the non-oprom parts when oprom execution is disabled sounds like the wrong thing to do)
Stefan
On Tue, 03 Aug 2010 11:34:27 +0200, Stefan Reinauer stefan.reinauer@coresystems.de wrote:
On 8/2/10 5:14 PM, repository service wrote:
Author: myles Date: Mon Aug 2 17:14:13 2010 New Revision: 5680 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5680
Log: Build VGA code conditionally to avoid errors when using SeaBIOS.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Kevin O'Connor kevin@koconnor.net
Modified: trunk/src/northbridge/intel/i82830/Makefile.inc trunk/src/northbridge/via/cn400/Makefile.inc trunk/src/northbridge/via/cn700/Makefile.inc trunk/src/northbridge/via/cx700/Makefile.inc trunk/src/northbridge/via/vt8623/Makefile.inc trunk/src/northbridge/via/vx800/Makefile.inc trunk/src/southbridge/amd/cs5530/Makefile.inc
I'm not too happy with this change.
- the change definitely breaks the i82830 MBI code
OOhh, we can't have this happening.....
On Tue, Aug 3, 2010 at 3:34 AM, Stefan Reinauer stefan.reinauer@coresystems.de wrote:
On 8/2/10 5:14 PM, repository service wrote:
Author: myles Date: Mon Aug 2 17:14:13 2010 New Revision: 5680 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5680
Log: Build VGA code conditionally to avoid errors when using SeaBIOS.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Kevin O'Connor kevin@koconnor.net
Modified: trunk/src/northbridge/intel/i82830/Makefile.inc trunk/src/northbridge/via/cn400/Makefile.inc trunk/src/northbridge/via/cn700/Makefile.inc trunk/src/northbridge/via/cx700/Makefile.inc trunk/src/northbridge/via/vt8623/Makefile.inc trunk/src/northbridge/via/vx800/Makefile.inc trunk/src/southbridge/amd/cs5530/Makefile.inc
I'm not too happy with this change.
Reverted in 5681. Now it doesn't compile without running the option ROM, but there are fewer surprises.
Thanks, Myles