Patchwork dev kit fixup

login
register
about
Submitter Myles Watson
Date 2009-09-29 17:14:01
Message ID <2831fecf0909291014u53c0679fw99e9b27606dcb55d@mail.gmail.com>
Download mbox | patch
Permalink /patch/308/
State Accepted
Headers show

Comments

Myles Watson - 2009-09-29 17:14:01
Now that we have CBFS, there is no need to have _vgarom_start in this port.

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

Thanks,
Myles
Stefan Reinauer - 2009-09-29 17:20:20
Myles Watson wrote:
> Now that we have CBFS, there is no need to have _vgarom_start in this
> port.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com <mailto:mylesgw@gmail.com>>
>
> Thanks,
> Myles
Could you try this on the devkit?

Acked-by: Stefan Reinauer <stepan@coresystems.de>
Myles Watson - 2009-09-29 17:23:57
On Tue, Sep 29, 2009 at 11:20 AM, Stefan Reinauer <stepan@coresystems.de> wrote:
> Myles Watson wrote:
>> Now that we have CBFS, there is no need to have _vgarom_start in this
>> port.

> Could you try this on the devkit?

No, I don't have it.  I was hoping someone with the board would try
it, but it seems pretty straightforward.  Since vga.rom isn't in the
tree, it wouldn't build with that option before anyway.

> Acked-by: Stefan Reinauer <stepan@coresystems.de>

Thanks.  If no one complains in the next few hours I'll commit it.

Myles
Myles Watson - 2009-09-29 20:25:01
On Tue, Sep 29, 2009 at 11:20 AM, Stefan Reinauer <stepan@coresystems.de> wrote:
> Myles Watson wrote:
>> Now that we have CBFS, there is no need to have _vgarom_start in this
>> port.
>>
>> Signed-off-by: Myles Watson <mylesgw@gmail.com <mailto:mylesgw@gmail.com>>
> Acked-by: Stefan Reinauer <stepan@coresystems.de>
Rev 4690.

Thanks,
Myles

Patch

Index: svn/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/Config.lb
+++ svn/src/mainboard/intel/xe7501devkit/Config.lb
@@ -14,17 +14,6 @@  if CONFIG_HAVE_PIRQ_TABLE 		object irq_t
 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
Index: svn/src/mainboard/intel/xe7501devkit/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/devicetree.cb
+++ svn/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
Index: svn/src/mainboard/intel/xe7501devkit/Makefile.inc
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ svn/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
 
Index: svn/src/mainboard/intel/xe7501devkit/chip.h
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/chip.h
+++ svn/src/mainboard/intel/xe7501devkit/chip.h
@@ -1,5 +1,3 @@ 
-extern unsigned char _vgarom_start[];
-
 extern struct chip_operations mainboard_ops;
 
 struct mainboard_config {
Index: svn/src/mainboard/intel/xe7501devkit/no_vgarom.S
===================================================================
--- svn.orig/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:
Index: svn/src/mainboard/intel/xe7501devkit/vgarom.S
===================================================================
--- svn.orig/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: