Remove pre-CBFS _vgabios_start and _vgabios_end.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4690 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 0 insertions, 36 deletions

diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 4557a6a6d5..98a1414e46 100644
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@@ -14,17 +14,6 @@ if CONFIG_HAVE_PIRQ_TABLE 		object irq_tables.o	 end
 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 @@ chip northbridge/intel/e7501
 			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
diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc
index 0102b60f9b..9f89eea4a8 100644
--- a/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ b/src/mainboard/intel/xe7501devkit/Makefile.inc
@@ -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
 
diff --git a/src/mainboard/intel/xe7501devkit/chip.h b/src/mainboard/intel/xe7501devkit/chip.h
index af1397bd0f..06f11d0862 100644
--- a/src/mainboard/intel/xe7501devkit/chip.h
+++ b/src/mainboard/intel/xe7501devkit/chip.h
@@ -1,5 +1,3 @@
-extern unsigned char _vgarom_start[];
-
 extern struct chip_operations mainboard_ops;
 
 struct mainboard_config {
diff --git a/src/mainboard/intel/xe7501devkit/devicetree.cb b/src/mainboard/intel/xe7501devkit/devicetree.cb
index 68d2b977eb..e5873a23af 100644
--- a/src/mainboard/intel/xe7501devkit/devicetree.cb
+++ b/src/mainboard/intel/xe7501devkit/devicetree.cb
@@ -27,7 +27,6 @@ chip northbridge/intel/e7501
 			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
diff --git a/src/mainboard/intel/xe7501devkit/no_vgarom.S b/src/mainboard/intel/xe7501devkit/no_vgarom.S
deleted file mode 100644
index 58c1dbb867..0000000000
--- a/src/mainboard/intel/xe7501devkit/no_vgarom.S
+++ /dev/null
@@ -1,6 +0,0 @@
-	.section .rodata.optionrom
-	.globl	_vgarom_start
-_vgarom_start:
-	.word 0xFFFF			// Invalid option ROM signature
-	.globl	_vgarom_end
-_vgarom_end:
diff --git a/src/mainboard/intel/xe7501devkit/vgarom.S b/src/mainboard/intel/xe7501devkit/vgarom.S
deleted file mode 100644
index ff7ebf61b9..0000000000
--- a/src/mainboard/intel/xe7501devkit/vgarom.S
+++ /dev/null
@@ -1,6 +0,0 @@
-	.section .rodata.optionrom
-	.globl	_vgarom_start
-_vgarom_start:
-	.incbin	"../../../../../src/mainboard/intel/xe7501devkit/vga.rom"
-	.globl	_vgarom_end
-_vgarom_end: