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
This commit is contained in:
parent
e59f2e1f33
commit
babb03a5be
|
@ -14,17 +14,6 @@ if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
|
||||||
if CONFIG_HAVE_ACPI_TABLES object acpi_tables.o end
|
if CONFIG_HAVE_ACPI_TABLES object acpi_tables.o end
|
||||||
object reset.o
|
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
|
## Romcc output
|
||||||
##
|
##
|
||||||
|
@ -141,7 +130,6 @@ chip northbridge/intel/e7501
|
||||||
device pci 1e.0 on # Hub to PCI bridge
|
device pci 1e.0 on # Hub to PCI bridge
|
||||||
chip drivers/pci/onboard # VGA ROM
|
chip drivers/pci/onboard # VGA ROM
|
||||||
device pci 0.0 on end
|
device pci 0.0 on end
|
||||||
register "rom_address" = "_vgarom_start"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
device pci 1f.0 on # LPC bridge
|
device pci 1f.0 on # LPC bridge
|
||||||
|
|
|
@ -1,13 +1,4 @@
|
||||||
ROMCCFLAGS := -mcpu=p4
|
ROMCCFLAGS := -mcpu=p4
|
||||||
obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
|
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
|
include $(src)/mainboard/Makefile.romccboard.inc
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
extern unsigned char _vgarom_start[];
|
|
||||||
|
|
||||||
extern struct chip_operations mainboard_ops;
|
extern struct chip_operations mainboard_ops;
|
||||||
|
|
||||||
struct mainboard_config {
|
struct mainboard_config {
|
||||||
|
|
|
@ -27,7 +27,6 @@ chip northbridge/intel/e7501
|
||||||
device pci 1e.0 on # Hub to PCI bridge
|
device pci 1e.0 on # Hub to PCI bridge
|
||||||
chip drivers/pci/onboard # VGA ROM
|
chip drivers/pci/onboard # VGA ROM
|
||||||
device pci 0.0 on end
|
device pci 0.0 on end
|
||||||
register "rom_address" = "_vgarom_start"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
device pci 1f.0 on # LPC bridge
|
device pci 1f.0 on # LPC bridge
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
.section .rodata.optionrom
|
|
||||||
.globl _vgarom_start
|
|
||||||
_vgarom_start:
|
|
||||||
.word 0xFFFF // Invalid option ROM signature
|
|
||||||
.globl _vgarom_end
|
|
||||||
_vgarom_end:
|
|
|
@ -1,6 +0,0 @@
|
||||||
.section .rodata.optionrom
|
|
||||||
.globl _vgarom_start
|
|
||||||
_vgarom_start:
|
|
||||||
.incbin "../../../../../src/mainboard/intel/xe7501devkit/vga.rom"
|
|
||||||
.globl _vgarom_end
|
|
||||||
_vgarom_end:
|
|
Loading…
Reference in New Issue