[coreboot] [v2] r4690 - trunk/coreboot-v2/src/mainboard/intel/xe7501devkit
svn at coreboot.org
svn at coreboot.org
Tue Sep 29 22:24:09 CEST 2009
Author: myles
Date: 2009-09-29 22:24:09 +0200 (Tue, 29 Sep 2009)
New Revision: 4690
Removed:
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/no_vgarom.S
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/vgarom.S
Modified:
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/chip.h
trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/devicetree.cb
Log:
Remove pre-CBFS _vgabios_start and _vgabios_end.
Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Config.lb 2009-09-29 20:24:09 UTC (rev 4690)
@@ -14,17 +14,6 @@
if CONFIG_HAVE_ACPI_TABLES object acpi_tables.o end
object reset.o
-# Include the VGA option ROM, but only if we're compiled to use it
-if CONFIG_PCI_ROM_RUN
- if CONFIG_CONSOLE_VGA
- object vgarom.S
- else
- object no_vgarom.S
- end
-else
- object no_vgarom.S
-end
-
##
## Romcc output
##
@@ -141,7 +130,6 @@
device pci 1e.0 on # Hub to PCI bridge
chip drivers/pci/onboard # VGA ROM
device pci 0.0 on end
- register "rom_address" = "_vgarom_start"
end
end
device pci 1f.0 on # LPC bridge
Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Makefile.inc 2009-09-29 20:24:09 UTC (rev 4690)
@@ -1,13 +1,4 @@
ROMCCFLAGS := -mcpu=p4
obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
-ifeq ($(CONFIG_PCI_ROM_RUN),y)
- ifeq ($(CONFIG_CONSOLE_VGA),y)
- obj-y += vgarom.o
- else
- obj-y += no_vgarom.o
- endif
-else
- obj-y += no_vgarom.o
-endif
include $(src)/mainboard/Makefile.romccboard.inc
Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/chip.h
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/chip.h 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/chip.h 2009-09-29 20:24:09 UTC (rev 4690)
@@ -1,5 +1,3 @@
-extern unsigned char _vgarom_start[];
-
extern struct chip_operations mainboard_ops;
struct mainboard_config {
Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/devicetree.cb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/devicetree.cb 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/devicetree.cb 2009-09-29 20:24:09 UTC (rev 4690)
@@ -27,7 +27,6 @@
device pci 1e.0 on # Hub to PCI bridge
chip drivers/pci/onboard # VGA ROM
device pci 0.0 on end
- register "rom_address" = "_vgarom_start"
end
end
device pci 1f.0 on # LPC bridge
Deleted: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/no_vgarom.S
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/no_vgarom.S 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/no_vgarom.S 2009-09-29 20:24:09 UTC (rev 4690)
@@ -1,6 +0,0 @@
- .section .rodata.optionrom
- .globl _vgarom_start
-_vgarom_start:
- .word 0xFFFF // Invalid option ROM signature
- .globl _vgarom_end
-_vgarom_end:
Deleted: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/vgarom.S
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/vgarom.S 2009-09-29 19:12:23 UTC (rev 4689)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/vgarom.S 2009-09-29 20:24:09 UTC (rev 4690)
@@ -1,6 +0,0 @@
- .section .rodata.optionrom
- .globl _vgarom_start
-_vgarom_start:
- .incbin "../../../../../src/mainboard/intel/xe7501devkit/vga.rom"
- .globl _vgarom_end
-_vgarom_end:
More information about the coreboot
mailing list