Patchwork Drop drivers/pci/onboard

login
register
about
Submitter Myles Watson
Date 2009-11-06 21:02:06
Message ID <2831fecf0911061302i37edc969n1ffe7501aa56bd33@mail.gmail.com>
Download mbox | patch
Permalink /patch/545/
State Accepted
Headers show

Comments

Myles Watson - 2009-11-06 21:02:06
On Fri, Nov 6, 2009 at 1:14 PM, Myles Watson <mylesgw@gmail.com> wrote:

>
>
> On Fri, Nov 6, 2009 at 12:56 PM, Myles Watson <mylesgw@gmail.com> wrote:
>
>>
>>
>> On Fri, Nov 6, 2009 at 12:41 PM, Peter Stuge <peter@stuge.se> wrote:
>>
>>>  Myles Watson wrote:
>>> > > > PCI onboard was only used for ROM images at fixed offsets in
>>> > > > flash.  Now that we have CBFS, there is no use for it.
>>>
>>>  But what about the PCI device ids which are being taken out of the
>>> device tree? Are they guaranteed to be discovered through automatic
>>> scanning?
>>>
>> Yes.  If the couldn't be probed, they would have been disabled even though
>> they were found in the tree.
>>
>> I wonder a little about the on_mainboard flag.  It's possible that some of
>> these devices would have had that flag set if they didn't need to have a
>> ROM.  I don't know of a good way to automatically figure out which devices
>> that would apply to.
>>
> The rest of the story :)
>
> The on_mainboard flag gets used to set subsystem IDs and
> CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST
>
I put all the devices back in the tree.  So they show up in static.c like
they should, they just don't have the onboard driver any more.

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

Thanks,
Myles
Carl-Daniel Hailfinger - 2009-11-06 21:34:32
On 06.11.2009 22:02, Myles Watson wrote:
> On Fri, Nov 6, 2009 at 1:14 PM, Myles Watson <mylesgw@gmail.com> wrote:
>
>   
>> On Fri, Nov 6, 2009 at 12:56 PM, Myles Watson <mylesgw@gmail.com> wrote:
>>
>>     
>>> On Fri, Nov 6, 2009 at 12:41 PM, Peter Stuge <peter@stuge.se> wrote:
>>>
>>>       
>>>>  Myles Watson wrote:
>>>>         
>>>>>>> PCI onboard was only used for ROM images at fixed offsets in
>>>>>>> flash.  Now that we have CBFS, there is no use for it.
>>>>>>>               
>>>>  But what about the PCI device ids which are being taken out of the
>>>> device tree? Are they guaranteed to be discovered through automatic
>>>> scanning?
>>>>
>>>>         
>>> Yes.  If the couldn't be probed, they would have been disabled even though
>>> they were found in the tree.
>>>
>>> I wonder a little about the on_mainboard flag.  It's possible that some of
>>> these devices would have had that flag set if they didn't need to have a
>>> ROM.  I don't know of a good way to automatically figure out which devices
>>> that would apply to.
>>>
>>>       
>> The rest of the story :)
>>
>> The on_mainboard flag gets used to set subsystem IDs and
>> CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST
>>
>>     
> I put all the devices back in the tree.  So they show up in static.c like
> they should, they just don't have the onboard driver any more.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com>
>   

I really like this patch, and the effort you put into removing commented
out variants as well. A few minor cosmetic points, but other than that it is
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
My comments are not strong requirements for a commit, I just would like
to know if some of this stuff was intentional.


> Index: svn/src/mainboard/asus/mew-vm/Config.lb
> ===================================================================
> --- svn.orig/src/mainboard/asus/mew-vm/Config.lb
> +++ svn/src/mainboard/asus/mew-vm/Config.lb
> @@ -97,18 +97,14 @@ chip northbridge/intel/i82810
>  	device pci_domain 0 on 
>  		device pci 0.0 on end # Host bridge
>  		device pci 1.0 on # Onboard Video
> -			#chip drivers/pci/onboard
>  			#	device pci 1.0 on end
>   

A device which hangs off itself? Kill?

> -		        #end
>  		end
>  		chip southbridge/intel/i82801xx # Southbridge
>        			register "ide0_enable" = "1"
>        			register "ide1_enable" = "1"
>  
>  			device pci 1e.0 on # PCI Bridge
> -				#chip drivers/pci/onboard
>  				#	device pci 1.0 on end
>   

Hm. Kill the above line? Could be a botched cut-n-paste.

> -			        #end
>  			end
>  			device pci 1f.0 on  # ISA/LPC? Bridge
>  				chip superio/smsc/lpc47b272
> Index: svn/src/mainboard/asus/mew-vm/devicetree.cb
> ===================================================================
> --- svn.orig/src/mainboard/asus/mew-vm/devicetree.cb
> +++ svn/src/mainboard/asus/mew-vm/devicetree.cb
> @@ -2,18 +2,14 @@ chip northbridge/intel/i82810
>  	device pci_domain 0 on 
>  		device pci 0.0 on end # Host bridge
>  		device pci 1.0 on # Onboard Video
> -			#chip drivers/pci/onboard
>  			#	device pci 1.0 on end
>   

See above.

> -		        #end
>  		end
>  		chip southbridge/intel/i82801xx # Southbridge
>        			register "ide0_enable" = "1"
>        			register "ide1_enable" = "1"
>  
>  			device pci 1e.0 on # PCI Bridge
> -				#chip drivers/pci/onboard
>  				#	device pci 1.0 on end
>   

Dito.

> -			        #end
>  			end
>  			device pci 1f.0 on  # ISA/LPC? Bridge
>  				chip superio/smsc/lpc47b272
> Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> ===================================================================
> --- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> +++ svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> @@ -178,9 +178,7 @@ chip northbridge/amd/amdk8/root_complex
>  			        chip southbridge/sis/sis966
>  					device pci 0.0 on end   # Northbridge
>  					device pci 1.0 on		# AGP bridge
> -					  chip drivers/pci/onboard	# Integrated VGA
>  						device pci 0.0 on end
>   

This looks fishy, but then again, I never understood the v2 device tree
syntax completely.

> -					  end
>  					end
>                  			device pci 2.0 on # LPC
>  						chip superio/ite/it8716f
>   

Regards,
Carl-Daniel
Myles Watson - 2009-11-06 21:47:12
On Fri, Nov 6, 2009 at 3:34 PM, Carl-Daniel Hailfinger <
c-d.hailfinger.devel.2006@gmx.net> wrote:

> On 06.11.2009 22:02, Myles Watson wrote:
> > On Fri, Nov 6, 2009 at 1:14 PM, Myles Watson <mylesgw@gmail.com> wrote:
> >
> >
> >> On Fri, Nov 6, 2009 at 12:56 PM, Myles Watson <mylesgw@gmail.com>
> wrote:
> >>
> >>
> >>> On Fri, Nov 6, 2009 at 12:41 PM, Peter Stuge <peter@stuge.se> wrote:
> >>>
> >>>
> >>>>  Myles Watson wrote:
> >>>>
> >>>>>>> PCI onboard was only used for ROM images at fixed offsets in
> >>>>>>> flash.  Now that we have CBFS, there is no use for it.
> >>>>>>>
> >>>>  But what about the PCI device ids which are being taken out of the
> >>>> device tree? Are they guaranteed to be discovered through automatic
> >>>> scanning?
> >>>>
> >>>>
> >>> Yes.  If the couldn't be probed, they would have been disabled even
> though
> >>> they were found in the tree.
> >>>
> >>> I wonder a little about the on_mainboard flag.  It's possible that some
> of
> >>> these devices would have had that flag set if they didn't need to have
> a
> >>> ROM.  I don't know of a good way to automatically figure out which
> devices
> >>> that would apply to.
> >>>
> >>>
> >> The rest of the story :)
> >>
> >> The on_mainboard flag gets used to set subsystem IDs and
> >> CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST
> >>
> >>
> > I put all the devices back in the tree.  So they show up in static.c like
> > they should, they just don't have the onboard driver any more.
> >
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
> >
>
> I really like this patch, and the effort you put into removing commented
> out variants as well. A few minor cosmetic points, but other than that it
> is
> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
>
Thanks.


> > Index: svn/src/mainboard/asus/mew-vm/Config.lb
> > ===================================================================
> > --- svn.orig/src/mainboard/asus/mew-vm/Config.lb
> > +++ svn/src/mainboard/asus/mew-vm/Config.lb
> > @@ -97,18 +97,14 @@ chip northbridge/intel/i82810
> >       device pci_domain 0 on
> >               device pci 0.0 on end # Host bridge
> >               device pci 1.0 on # Onboard Video
> > -                     #chip drivers/pci/onboard
> >                       #       device pci 1.0 on end
> >
>
> A device which hangs off itself?

I couldn't tell.  The PCI devfn (1.0) doesn't help because a child device
will be on a different bus, so it's allowed to have the same devfn as its
parent.  That's why I left it.


>
> >                       device pci 1e.0 on # PCI Bridge
> > -                             #chip drivers/pci/onboard
> >                               #       device pci 1.0 on end
> >
>
> Hm. Kill the above line? Could be a botched cut-n-paste.
>
Could be.  Again, I couldn't tell.  Anyone with the board would know the
first time they booted, so it could be removed.  I was trying to be
minimally invasive.


>
> > Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> > ===================================================================
> > --- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> > +++ svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> > @@ -178,9 +178,7 @@ chip northbridge/amd/amdk8/root_complex
> >                               chip southbridge/sis/sis966
> >                                       device pci 0.0 on end   #
> Northbridge
> >                                       device pci 1.0 on               #
> AGP bridge
> > -                                       chip drivers/pci/onboard      #
> Integrated VGA
> >                                               device pci 0.0 on end
> >
>
> This looks fishy, but then again, I never understood the v2 device tree
> syntax completely.
>
I'm not sure what looks fishy here.  This is the way I understand it:
1. Devices between the 'on' and 'end' tokens are children (or children of
children) of the device.
2. The 'chip' token assigns the driver for devices inside it.

So in this case, device 1.0 has an AGP bus with 0.0 hanging off of it.

Thanks,
Myles
Carl-Daniel Hailfinger - 2009-11-06 22:31:06
On 06.11.2009 22:47, Myles Watson wrote:
> On Fri, Nov 6, 2009 at 3:34 PM, Carl-Daniel Hailfinger 
> <c-d.hailfinger.devel.2006@gmx.net> wrote:
>
>   
>> A device which hangs off itself?
>>     
>
> I couldn't tell.  The PCI devfn (1.0) doesn't help because a child device
> will be on a different bus, so it's allowed to have the same devfn as its
> parent.  That's why I left it.
>   

Ah.


>> Hm. Kill the above line? Could be a botched cut-n-paste.
>>     
> Could be.  Again, I couldn't tell.  Anyone with the board would know the
> first time they booted, so it could be removed.  I was trying to be
> minimally invasive.
>   

Right. Good goal.


> I'm not sure what looks fishy here.  This is the way I understand it:
> 1. Devices between the 'on' and 'end' tokens are children (or children of
> children) of the device.
> 2. The 'chip' token assigns the driver for devices inside it.
>
> So in this case, device 1.0 has an AGP bus with 0.0 hanging off of it.
>   

Thanks for the explanation.
Go ahead!

Regards,
Carl-Daniel
Stefan Reinauer - 2009-11-06 23:06:14
Myles Watson wrote:
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com <mailto:mylesgw@gmail.com>>

Acked-by: Stefan Reinauer <stepan@coresystems.de>
Stefan Reinauer - 2009-11-06 23:19:43
Myles Watson wrote:
>
>
> On Fri, Nov 6, 2009 at 3:34 PM, Carl-Daniel Hailfinger
> <c-d.hailfinger.devel.2006@gmx.net
> <mailto:c-d.hailfinger.devel.2006@gmx.net>> wrote:
>
>     On 06.11.2009 22:02, Myles Watson wrote:
>     > On Fri, Nov 6, 2009 at 1:14 PM, Myles Watson <mylesgw@gmail.com
>     <mailto:mylesgw@gmail.com>> wrote:
>     >
>     >
>     >> On Fri, Nov 6, 2009 at 12:56 PM, Myles Watson
>     <mylesgw@gmail.com <mailto:mylesgw@gmail.com>> wrote:
>     >>
>     >>
>     >>> On Fri, Nov 6, 2009 at 12:41 PM, Peter Stuge <peter@stuge.se
>     <mailto:peter@stuge.se>> wrote:
>     >>>
>     >>>
>     >>>>  Myles Watson wrote:
>     >>>>
>     >>>>>>> PCI onboard was only used for ROM images at fixed offsets in
>     >>>>>>> flash.  Now that we have CBFS, there is no use for it.
>     >>>>>>>
>     >>>>  But what about the PCI device ids which are being taken out
>     of the
>     >>>> device tree? Are they guaranteed to be discovered through
>     automatic
>     >>>> scanning?
>     >>>>
>     >>>>
>     >>> Yes.  If the couldn't be probed, they would have been disabled
>     even though
>     >>> they were found in the tree.
>     >>>
>     >>> I wonder a little about the on_mainboard flag.  It's possible
>     that some of
>     >>> these devices would have had that flag set if they didn't need
>     to have a
>     >>> ROM.  I don't know of a good way to automatically figure out
>     which devices
>     >>> that would apply to.
>     >>>
>     >>>
>     >> The rest of the story :)
>     >>
>     >> The on_mainboard flag gets used to set subsystem IDs and
>     >> CONFIG_CONSOLE_VGA_ONBOARD_AT_FIRST
>     >>
>     >>
>     > I put all the devices back in the tree.  So they show up in
>     static.c like
>     > they should, they just don't have the onboard driver any more.
>     >
>     > Signed-off-by: Myles Watson <mylesgw@gmail.com
>     <mailto:mylesgw@gmail.com>>
>     >
>
>     I really like this patch, and the effort you put into removing
>     commented
>     out variants as well. A few minor cosmetic points, but other than
>     that it is
>     Acked-by: Carl-Daniel Hailfinger
>     <c-d.hailfinger.devel.2006@gmx.net
>     <mailto:c-d.hailfinger.devel.2006@gmx.net>>
>
> Thanks.
>  
>
>     > Index: svn/src/mainboard/asus/mew-vm/Config.lb
>     > ===================================================================
>     > --- svn.orig/src/mainboard/asus/mew-vm/Config.lb
>     > +++ svn/src/mainboard/asus/mew-vm/Config.lb
>     > @@ -97,18 +97,14 @@ chip northbridge/intel/i82810
>     >       device pci_domain 0 on
>     >               device pci 0.0 on end # Host bridge
>     >               device pci 1.0 on # Onboard Video
>     > -                     #chip drivers/pci/onboard
>     >                       #       device pci 1.0 on end
>     >
>
>     A device which hangs off itself?
>
> I couldn't tell.  The PCI devfn (1.0) doesn't help because a child
> device will be on a different bus, so it's allowed to have the same
> devfn as its parent.  That's why I left it.
I was about to write the same comment as Carl-Daniel. But, on the i945
0:1.0 is a bridge of which the (on i945 external PCIe) graphics hangs off.
So, the second 1.0 is indeed most likely supposed to be a device hanging
off a bridge at 0:1.0.


>  
>
>
>     >                       device pci 1e.0 on # PCI Bridge
>     > -                             #chip drivers/pci/onboard
>     >                               #       device pci 1.0 on end
>     >
>
>     Hm. Kill the above line? Could be a botched cut-n-paste.
>
> Could be.  Again, I couldn't tell.  Anyone with the board would know
> the first time they booted, so it could be removed.  I was trying to
> be minimally invasive.
Good.


>
>     > Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
>     > ===================================================================
>     > --- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
>     > +++ svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
>     > @@ -178,9 +178,7 @@ chip northbridge/amd/amdk8/root_complex
>     >                               chip southbridge/sis/sis966
>     >                                       device pci 0.0 on end   #
>     Northbridge
>     >                                       device pci 1.0 on        
>           # AGP bridge
>     > -                                       chip drivers/pci/onboard
>          # Integrated VGA
>     >                                               device pci 0.0 on end
>     >
>
>     This looks fishy, but then again, I never understood the v2 device
>     tree
>     syntax completely.
>

> I'm not sure what looks fishy here.  This is the way I understand it:
> 1. Devices between the 'on' and 'end' tokens are children (or children
> of children) of the device.
> 2. The 'chip' token assigns the driver for devices inside it.
>
> So in this case, device 1.0 has an AGP bus with 0.0 hanging off of it.
In which case the inner device pci 0.0 on end should be removed.
Otherwise it gets assigned an on_mainboard = 1, and be treated as an
on-mainboard graphics card even though it's an AGP plugin card.

Generally, the static tree should only contain devices that can not be
removed

But, to be sure we might want to trust the original authors of the
device trees that they knew what they were doing unless someone reports
a problem or fixes one.

Stefan
Myles Watson - 2009-11-06 23:43:42
> Go ahead!

Rev 4925.

Thanks,
Myles
Myles Watson - 2009-11-06 23:46:13
> >
> >     > Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> >     > ===================================================================
> >     > --- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> >     > +++ svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
> >     > @@ -178,9 +178,7 @@ chip northbridge/amd/amdk8/root_complex
> >     >                               chip southbridge/sis/sis966
> >     >                                       device pci 0.0 on end   #
> >     Northbridge
> >     >                                       device pci 1.0 on
> >           # AGP bridge
> >     > -                                       chip drivers/pci/onboard
> >          # Integrated VGA
> >     >                                               device pci 0.0 on end
> >     >
> >
> >     This looks fishy, but then again, I never understood the v2 device
> >     tree
> >     syntax completely.
> >
>
> > I'm not sure what looks fishy here.  This is the way I understand it:
> > 1. Devices between the 'on' and 'end' tokens are children (or children
> > of children) of the device.
> > 2. The 'chip' token assigns the driver for devices inside it.
> >
> > So in this case, device 1.0 has an AGP bus with 0.0 hanging off of it.
> In which case the inner device pci 0.0 on end should be removed.
> Otherwise it gets assigned an on_mainboard = 1, and be treated as an
> on-mainboard graphics card even though it's an AGP plugin card.
>
Yeah.  I thought maybe it was on-mainboard AGP.


> Generally, the static tree should only contain devices that can not be
> removed
>
Agreed.  That gets a little problematic with some of the "stuff options"
where some of the boards have SCSI or an extra nic or...

But, to be sure we might want to trust the original authors of the
> device trees that they knew what they were doing unless someone reports
> a problem or fixes one.
>
Sounds good.

Thanks,
Myles

Patch

Index: svn/src/mainboard/amd/dbm690t/Config.lb
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/Config.lb
+++ svn/src/mainboard/amd/dbm690t/Config.lb
@@ -155,9 +155,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/amd/dbm690t/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/devicetree.cb
+++ svn/src/mainboard/amd/dbm690t/devicetree.cb
@@ -20,9 +20,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/amd/pistachio/Config.lb
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/Config.lb
+++ svn/src/mainboard/amd/pistachio/Config.lb
@@ -156,9 +156,7 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 0.0 on end # HT  	0x7910
 				#	device pci 0.1 off end # CLK
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/amd/pistachio/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/devicetree.cb
+++ svn/src/mainboard/amd/pistachio/devicetree.cb
@@ -21,9 +21,7 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 0.0 on end # HT  	0x7910
 				#	device pci 0.1 off end # CLK
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/arima/hdama/Config.lb
===================================================================
--- svn.orig/src/mainboard/arima/hdama/Config.lb
+++ svn/src/mainboard/arima/hdama/Config.lb
@@ -177,9 +177,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on  end	# USB1
 						device pci 0.2 off end	# USB 2.0
 						device pci 1.0 off end	# LAN
-						chip drivers/pci/onboard
-							device pci 6.0 on end # ATI Rage XL
-						end
+						device pci 6.0 on end # ATI Rage XL
 						## PCI Slot 5 (correct?)
 						#chip drivers/generic/generic
 						#	device pci 5.0 on
Index: svn/src/mainboard/arima/hdama/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/arima/hdama/devicetree.cb
+++ svn/src/mainboard/arima/hdama/devicetree.cb
@@ -73,9 +73,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on  end	# USB1
 						device pci 0.2 off end	# USB 2.0
 						device pci 1.0 off end	# LAN
-						chip drivers/pci/onboard
-							device pci 6.0 on end # ATI Rage XL
-						end
+						device pci 6.0 on end # ATI Rage XL
 						## PCI Slot 5 (correct?)
 						#chip drivers/generic/generic
 						#	device pci 5.0 on
Index: svn/src/mainboard/asi/mb_5blmp/Config.lb
===================================================================
--- svn.orig/src/mainboard/asi/mb_5blmp/Config.lb
+++ svn/src/mainboard/asi/mb_5blmp/Config.lb
@@ -135,11 +135,6 @@  chip northbridge/amd/gx1		# Northbridge
       device pci 12.2 on  end		# IDE
       device pci 12.3 on  end		# Audio
       device pci 12.4 on  end		# VGA (onboard)
-      # device pci 12.4 on		# VGA (onboard)
-      #   chip drivers/pci/onboard
-      #     device pci 12.4 on end
-      #   end
-      # end
       device pci 13.0 on end		# USB
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/asi/mb_5blmp/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/asi/mb_5blmp/devicetree.cb
+++ svn/src/mainboard/asi/mb_5blmp/devicetree.cb
@@ -37,11 +37,6 @@  chip northbridge/amd/gx1		# Northbridge
       device pci 12.2 on  end		# IDE
       device pci 12.3 on  end		# Audio
       device pci 12.4 on  end		# VGA (onboard)
-      # device pci 12.4 on		# VGA (onboard)
-      #   chip drivers/pci/onboard
-      #     device pci 12.4 on end
-      #   end
-      # end
       device pci 13.0 on end		# USB
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/asus/mew-vm/Config.lb
===================================================================
--- svn.orig/src/mainboard/asus/mew-vm/Config.lb
+++ svn/src/mainboard/asus/mew-vm/Config.lb
@@ -97,18 +97,14 @@  chip northbridge/intel/i82810
 	device pci_domain 0 on 
 		device pci 0.0 on end # Host bridge
 		device pci 1.0 on # Onboard Video
-			#chip drivers/pci/onboard
 			#	device pci 1.0 on end
-		        #end
 		end
 		chip southbridge/intel/i82801xx # Southbridge
       			register "ide0_enable" = "1"
       			register "ide1_enable" = "1"
 
 			device pci 1e.0 on # PCI Bridge
-				#chip drivers/pci/onboard
 				#	device pci 1.0 on end
-			        #end
 			end
 			device pci 1f.0 on  # ISA/LPC? Bridge
 				chip superio/smsc/lpc47b272
Index: svn/src/mainboard/asus/mew-vm/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/asus/mew-vm/devicetree.cb
+++ svn/src/mainboard/asus/mew-vm/devicetree.cb
@@ -2,18 +2,14 @@  chip northbridge/intel/i82810
 	device pci_domain 0 on 
 		device pci 0.0 on end # Host bridge
 		device pci 1.0 on # Onboard Video
-			#chip drivers/pci/onboard
 			#	device pci 1.0 on end
-		        #end
 		end
 		chip southbridge/intel/i82801xx # Southbridge
       			register "ide0_enable" = "1"
       			register "ide1_enable" = "1"
 
 			device pci 1e.0 on # PCI Bridge
-				#chip drivers/pci/onboard
 				#	device pci 1.0 on end
-			        #end
 			end
 			device pci 1f.0 on  # ISA/LPC? Bridge
 				chip superio/smsc/lpc47b272
Index: svn/src/mainboard/broadcom/blast/Config.lb
===================================================================
--- svn.orig/src/mainboard/broadcom/blast/Config.lb
+++ svn/src/mainboard/broadcom/blast/Config.lb
@@ -207,21 +207,8 @@  chip northbridge/amd/amdk8/root_complex
                                         device pci 2.0 on end # USB        0x0223
                                         device pci 2.1 on end # USB
                                         device pci 2.2 on end # USB
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE (0,1) < CONFIG_HT_CHAIN_UNITID_BASE (6,,,,),
-                                        chip drivers/pci/onboard
-                                              device pci 4.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed, fake one to get the rom_address
-                                                                    # if CONFIG_HT_CHAIN_END_UNITID_BASE=0, it is 5, if CONFIG_HT_CHAIN_END_UNITID_BASE=1, it is 4
-                                        end
+                                        device pci 4.0 on end # it is in bcm5785_0 bus
                                 end
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE > CONFIG_HT_CHAIN_UNITID_BASE (6, ,,,,)
-#                                        chip drivers/pci/onboard
-#                                              device pci 0.0 on end # fake, will be disabled
-#                                        end
-#                                        chip drivers/pci/onboard
-#                                              device pci 5.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed
-#                                        end
-
-
 			end #  device pci 18.0
 
                         device pci 18.0 on end
Index: svn/src/mainboard/broadcom/blast/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/broadcom/blast/devicetree.cb
+++ svn/src/mainboard/broadcom/blast/devicetree.cb
@@ -105,21 +105,8 @@  chip northbridge/amd/amdk8/root_complex
                                         device pci 2.0 on end # USB        0x0223
                                         device pci 2.1 on end # USB
                                         device pci 2.2 on end # USB
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE (0,1) < CONFIG_HT_CHAIN_UNITID_BASE (6,,,,),
-                                        chip drivers/pci/onboard
-                                              device pci 4.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed, fake one to get the rom_address
-                                                                    # if CONFIG_HT_CHAIN_END_UNITID_BASE=0, it is 5, if CONFIG_HT_CHAIN_END_UNITID_BASE=1, it is 4
-                                        end
+                                        device pci 4.0 on end # it is in bcm5785_0 bus
                                 end
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE > CONFIG_HT_CHAIN_UNITID_BASE (6, ,,,,)
-#                                        chip drivers/pci/onboard
-#                                              device pci 0.0 on end # fake, will be disabled
-#                                        end
-#                                        chip drivers/pci/onboard
-#                                              device pci 5.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed
-#                                        end
-
-
 			end #  device pci 18.0
 
                         device pci 18.0 on end
Index: svn/src/mainboard/digitallogic/msm586seg/Config.lb
===================================================================
--- svn.orig/src/mainboard/digitallogic/msm586seg/Config.lb
+++ svn/src/mainboard/digitallogic/msm586seg/Config.lb
@@ -102,13 +102,8 @@  config chip.h
 chip cpu/amd/sc520
 	device pci_domain 0 on 
 		device pci 0.0 on end
-	
-		chip drivers/pci/onboard
-			device pci 12.0 on end # enet
-		end
-		chip drivers/pci/onboard
-			device pci 14.0 on end # 69000
-		end
+		device pci 12.0 on end # enet
+		device pci 14.0 on end # 69000
 #		register "com1" = "{1}"
 #		register "com1" = "{1, 0, 0x3f8, 4}"
 	end
Index: svn/src/mainboard/digitallogic/msm586seg/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/digitallogic/msm586seg/devicetree.cb
+++ svn/src/mainboard/digitallogic/msm586seg/devicetree.cb
@@ -1,13 +1,8 @@ 
 chip cpu/amd/sc520
 	device pci_domain 0 on 
 		device pci 0.0 on end
-	
-		chip drivers/pci/onboard
-			device pci 12.0 on end # enet
-		end
-		chip drivers/pci/onboard
-			device pci 14.0 on end # 69000
-		end
+		device pci 12.0 on end # enet
+		device pci 14.0 on end # 69000
 #		register "com1" = "{1}"
 #		register "com1" = "{1, 0, 0x3f8, 4}"
 	end
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
@@ -178,9 +178,7 @@  chip northbridge/amd/amdk8/root_complex
 			        chip southbridge/sis/sis966
 					device pci 0.0 on end   # Northbridge
 					device pci 1.0 on		# AGP bridge
-					  chip drivers/pci/onboard	# Integrated VGA
 						device pci 0.0 on end
-					  end
 					end
                 			device pci 2.0 on # LPC
 						chip superio/ite/it8716f
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
@@ -11,9 +11,7 @@  chip northbridge/amd/amdk8/root_complex
 			        chip southbridge/sis/sis966
 					device pci 0.0 on end   # Northbridge
 					device pci 1.0 on		# AGP bridge
-					  chip drivers/pci/onboard	# Integrated VGA
 						device pci 0.0 on end
-					  end
 					end
                 			device pci 2.0 on # LPC
 						chip superio/ite/it8716f
Index: svn/src/mainboard/hp/e_vectra_p2706t/Config.lb
===================================================================
--- svn.orig/src/mainboard/hp/e_vectra_p2706t/Config.lb
+++ svn/src/mainboard/hp/e_vectra_p2706t/Config.lb
@@ -76,9 +76,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    chip drivers/pci/onboard			# Onboard VGA
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end			# Onboard VGA
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
+++ svn/src/mainboard/hp/e_vectra_p2706t/devicetree.cb
@@ -7,9 +7,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    chip drivers/pci/onboard			# Onboard VGA
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end			# Onboard VGA
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/ibm/e326/Config.lb
===================================================================
--- svn.orig/src/mainboard/ibm/e326/Config.lb
+++ svn/src/mainboard/ibm/e326/Config.lb
@@ -125,9 +125,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 on end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end # ATI Rage XL
-                                                end
+                                               device pci 5.0 on end # ATI Rage XL
 					end
 					device pci 1.0 on
 						chip superio/nsc/pc87366
Index: svn/src/mainboard/ibm/e326/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/ibm/e326/devicetree.cb
+++ svn/src/mainboard/ibm/e326/devicetree.cb
@@ -21,9 +21,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 on end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end # ATI Rage XL
-                                                end
+                                               device pci 5.0 on end # ATI Rage XL
 					end
 					device pci 1.0 on
 						chip superio/nsc/pc87366
Index: svn/src/mainboard/intel/d945gclf/Config.lb
===================================================================
--- svn.orig/src/mainboard/intel/d945gclf/Config.lb
+++ svn/src/mainboard/intel/d945gclf/Config.lb
@@ -150,9 +150,7 @@  chip northbridge/intel/i945
         device pci_domain 0 on 
                 device pci 00.0 on end # host bridge
 		device pci 01.0 off end # i945 PCIe root port
-		chip drivers/pci/onboard
-			device pci 02.0 on end # vga controller
-		end
+		device pci 02.0 on end # vga controller
 		device pci 02.1 on end # display controller
 
                 chip southbridge/intel/i82801gx
Index: svn/src/mainboard/intel/d945gclf/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/intel/d945gclf/devicetree.cb
+++ svn/src/mainboard/intel/d945gclf/devicetree.cb
@@ -28,9 +28,7 @@  chip northbridge/intel/i945
         device pci_domain 0 on 
                 device pci 00.0 on end # host bridge
 		device pci 01.0 off end # i945 PCIe root port
-		chip drivers/pci/onboard
-			device pci 02.0 on end # vga controller
-		end
+		device pci 02.0 on end # vga controller
 		device pci 02.1 on end # display controller
 
                 chip southbridge/intel/i82801gx
Index: svn/src/mainboard/iwill/dk8_htx/Config.lb
===================================================================
--- svn.orig/src/mainboard/iwill/dk8_htx/Config.lb
+++ svn/src/mainboard/iwill/dk8_htx/Config.lb
@@ -232,9 +232,6 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                #chip drivers/pci/onboard
-                                                #        device pci 6.0 on end
-                                                #end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/iwill/dk8_htx/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/iwill/dk8_htx/devicetree.cb
+++ svn/src/mainboard/iwill/dk8_htx/devicetree.cb
@@ -24,9 +24,6 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                #chip drivers/pci/onboard
-                                                #        device pci 6.0 on end
-                                                #end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/kontron/986lcd-m/Config.lb
===================================================================
--- svn.orig/src/mainboard/kontron/986lcd-m/Config.lb
+++ svn/src/mainboard/kontron/986lcd-m/Config.lb
@@ -153,9 +153,7 @@  chip northbridge/intel/i945
                 device pci 00.0 on end # host bridge
 		# autodetect 0:1.0 because it might or might not be there.
 		# device pci 01.0 off end # i945 PCIe root port
-		chip drivers/pci/onboard
-			device pci 02.0 on end # vga controller
-		end
+		device pci 02.0 on end # vga controller
 		device pci 02.1 on end # display controller
 
                 chip southbridge/intel/i82801gx
Index: svn/src/mainboard/kontron/986lcd-m/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/kontron/986lcd-m/devicetree.cb
+++ svn/src/mainboard/kontron/986lcd-m/devicetree.cb
@@ -9,9 +9,7 @@  chip northbridge/intel/i945
         device pci_domain 0 on 
                 device pci 00.0 on end # host bridge
 		device pci 01.0 off end # i945 PCIe root port
-		chip drivers/pci/onboard
-			device pci 02.0 on end # vga controller
-		end
+		device pci 02.0 on end # vga controller
 		device pci 02.1 on end # display controller
 
                 chip southbridge/intel/i82801gx
Index: svn/src/mainboard/kontron/kt690/Config.lb
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/Config.lb
+++ svn/src/mainboard/kontron/kt690/Config.lb
@@ -155,9 +155,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/kontron/kt690/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/devicetree.cb
+++ svn/src/mainboard/kontron/kt690/devicetree.cb
@@ -20,9 +20,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/mitac/6513wu/Config.lb
===================================================================
--- svn.orig/src/mainboard/mitac/6513wu/Config.lb
+++ svn/src/mainboard/mitac/6513wu/Config.lb
@@ -80,9 +80,7 @@  chip northbridge/intel/i82810           
   end
   device pci_domain 0 on                # PCI domain
     device pci 0.0 on end               # Graphics Memory Controller Hub (GMCH)
-    chip drivers/pci/onboard
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end
     chip southbridge/intel/i82801xx     # Southbridge
       register "pirqa_routing" = "0x03"
       register "pirqb_routing" = "0x05"
Index: svn/src/mainboard/mitac/6513wu/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/mitac/6513wu/devicetree.cb
+++ svn/src/mainboard/mitac/6513wu/devicetree.cb
@@ -26,9 +26,7 @@  chip northbridge/intel/i82810           
   end
   device pci_domain 0 on                # PCI domain
     device pci 0.0 on end               # Graphics Memory Controller Hub (GMCH)
-    chip drivers/pci/onboard
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end
     chip southbridge/intel/i82801xx     # Southbridge
       register "pirqa_routing" = "0x03"
       register "pirqb_routing" = "0x05"
Index: svn/src/mainboard/msi/ms6178/Config.lb
===================================================================
--- svn.orig/src/mainboard/msi/ms6178/Config.lb
+++ svn/src/mainboard/msi/ms6178/Config.lb
@@ -75,9 +75,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    chip drivers/pci/onboard			# Onboard VGA
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end			# Onboard VGA
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/msi/ms6178/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/msi/ms6178/devicetree.cb
+++ svn/src/mainboard/msi/ms6178/devicetree.cb
@@ -26,9 +26,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    chip drivers/pci/onboard			# Onboard VGA
-      device pci 1.0 on end
-    end
+    device pci 1.0 on end			# Onboard VGA
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/msi/ms9185/Config.lb
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/Config.lb
+++ svn/src/mainboard/msi/ms9185/Config.lb
@@ -207,29 +207,8 @@  chip northbridge/amd/amdk8/root_complex
                                         device pci 2.0 on end # USB        0x0223
                                         device pci 2.1 on end # USB
                                         device pci 2.2 on end # USB
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE (0,1) < CONFIG_HT_CHAIN_UNITID_BASE (6,,,,),
-                                        chip drivers/pci/onboard
-                                              device pci 3.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed, fake one to get the rom_address
-                                                                    # if CONFIG_HT_CHAIN_END_UNITID_BASE=0, it is 4, if CONFIG_HT_CHAIN_END_UNITID_BASE=1, it is 3
-                                        end
-                                       #bx_a013+ start
-                                       #chip drivers/pci/onboard    #SATA2
-                                       #       device pci 5.0 on end
-                                       #       device pci 5.1 on end
-                                       #       device pci 5.2 on end
-                                       #       device pci 5.3 on end
-                                       #end
-                                       #bx_a013+ end
-
+                                        device pci 3.0 on end # it is in bcm5785_0 bus
                                 end
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE > CONFIG_HT_CHAIN_UNITID_BASE (6, ,,,,)
-#                                        chip drivers/pci/onboard
-#                                              device pci 0.0 on end # fake, will be disabled
-#                                        end
-#                                        chip drivers/pci/onboard
-#                                              device pci 4.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed
-#                                        end
-
                        end #  device pci 18.0
                        device pci 18.1 on end
                        device pci 18.2 on end
Index: svn/src/mainboard/msi/ms9185/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/devicetree.cb
+++ svn/src/mainboard/msi/ms9185/devicetree.cb
@@ -73,29 +73,8 @@  chip northbridge/amd/amdk8/root_complex
                                         device pci 2.0 on end # USB        0x0223
                                         device pci 2.1 on end # USB
                                         device pci 2.2 on end # USB
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE (0,1) < CONFIG_HT_CHAIN_UNITID_BASE (6,,,,),
-                                        chip drivers/pci/onboard
-                                              device pci 3.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed, fake one to get the rom_address
-                                                                    # if CONFIG_HT_CHAIN_END_UNITID_BASE=0, it is 4, if CONFIG_HT_CHAIN_END_UNITID_BASE=1, it is 3
-                                        end
-                                       #bx_a013+ start
-                                       #chip drivers/pci/onboard    #SATA2
-                                       #       device pci 5.0 on end
-                                       #       device pci 5.1 on end
-                                       #       device pci 5.2 on end
-                                       #       device pci 5.3 on end
-                                       #end
-                                       #bx_a013+ end
-
+                                        device pci 3.0 on end # it is in bcm5785_0 bus
                                 end
-                                        #when CONFIG_HT_CHAIN_END_UNITID_BASE > CONFIG_HT_CHAIN_UNITID_BASE (6, ,,,,)
-#                                        chip drivers/pci/onboard
-#                                              device pci 0.0 on end # fake, will be disabled
-#                                        end
-#                                        chip drivers/pci/onboard
-#                                              device pci 4.0 on end # it is in bcm5785_0 bus, but the device id can not be changed even unitid is changed
-#                                        end
-
                        end #  device pci 18.0
                        device pci 18.1 on end
                        device pci 18.2 on end
Index: svn/src/mainboard/msi/ms9282/Config.lb
===================================================================
--- svn.orig/src/mainboard/msi/ms9282/Config.lb
+++ svn/src/mainboard/msi/ms9282/Config.lb
@@ -278,27 +278,21 @@  chip northbridge/amd/amdk8/root_complex
                                        device pci 5.1 on  end # SATA 1
                                        device pci 5.2 on  end # SATA 2
                                        device pci 6.0 on  #P2P
-                                               chip drivers/pci/onboard
-                                                       device pci 4.0 on end
-                                               end
+                                               device pci 4.0 on end
                                        end # P2P
                                        device pci 7.0 on end # reserve
                                        device pci 8.0 on end # MAC0
                                        device pci 9.0 on end # MAC1
                                        device pci a.0 on
                                                device pci 0.0 on
-                                                       chip drivers/pci/onboard
-                                                               device pci 4.0 on end  #pci_E lan1
-                                                               device pci 4.1 on end  #pci_E lan2
-                                                       end
+                                                       device pci 4.0 on end  #pci_E lan1
+                                                       device pci 4.1 on end  #pci_E lan2
                                                end
                                        end # 0x376
                                                device pci b.0 on  end # PCI E 0x374
                                        device pci c.0 on  end
                                        device pci d.0 on   #SAS
-                                               chip drivers/pci/onboard
-                                                       device pci 0.0 on end
-                                               end
+                                               device pci 0.0 on end
                                        end # PCI E 1 0x378
                                        device pci e.0 on end # PCI E 0 0x375
                                        device pci f.0 on end   #PCI E 0x377  pci_E slot
Index: svn/src/mainboard/msi/ms9282/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/msi/ms9282/devicetree.cb
+++ svn/src/mainboard/msi/ms9282/devicetree.cb
@@ -137,27 +137,21 @@  chip northbridge/amd/amdk8/root_complex
                                        device pci 5.1 on  end # SATA 1
                                        device pci 5.2 on  end # SATA 2
                                        device pci 6.0 on  #P2P
-                                               chip drivers/pci/onboard
-                                                       device pci 4.0 on end
-                                               end
+                                               device pci 4.0 on end
                                        end # P2P
                                        device pci 7.0 on end # reserve
                                        device pci 8.0 on end # MAC0
                                        device pci 9.0 on end # MAC1
                                        device pci a.0 on
                                                device pci 0.0 on
-                                                       chip drivers/pci/onboard
-                                                               device pci 4.0 on end  #pci_E lan1
-                                                               device pci 4.1 on end  #pci_E lan2
-                                                       end
+                                                       device pci 4.0 on end  #pci_E lan1
+                                                       device pci 4.1 on end  #pci_E lan2
                                                end
                                        end # 0x376
                                                device pci b.0 on  end # PCI E 0x374
                                        device pci c.0 on  end
                                        device pci d.0 on   #SAS
-                                               chip drivers/pci/onboard
-                                                       device pci 0.0 on end
-                                               end
+                                               device pci 0.0 on end
                                        end # PCI E 1 0x378
                                        device pci e.0 on end # PCI E 0 0x375
                                        device pci f.0 on end   #PCI E 0x377  pci_E slot
Index: svn/src/mainboard/nec/powermate2000/Config.lb
===================================================================
--- svn.orig/src/mainboard/nec/powermate2000/Config.lb
+++ svn/src/mainboard/nec/powermate2000/Config.lb
@@ -75,11 +75,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    device pci 1.0 off				# Onboard video
-      # chip drivers/pci/onboard
-      #   device pci 1.0 on end
-      # end
-    end
+    device pci 1.0 off end			# Onboard video
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/nec/powermate2000/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/nec/powermate2000/devicetree.cb
+++ svn/src/mainboard/nec/powermate2000/devicetree.cb
@@ -6,11 +6,7 @@  chip northbridge/intel/i82810			# Northb
   end
   device pci_domain 0 on
     device pci 0.0 on end			# Host bridge
-    device pci 1.0 off				# Onboard video
-      # chip drivers/pci/onboard
-      #   device pci 1.0 on end
-      # end
-    end
+    device pci 1.0 off end			# Onboard video
     chip southbridge/intel/i82801xx		# Southbridge
       register "ide0_enable" = "1"
       register "ide1_enable" = "1"
Index: svn/src/mainboard/rca/rm4100/Config.lb
===================================================================
--- svn.orig/src/mainboard/rca/rm4100/Config.lb
+++ svn/src/mainboard/rca/rm4100/Config.lb
@@ -75,9 +75,7 @@  config chip.h
 chip northbridge/intel/i82830		# Northbridge
   device pci_domain 0 on		# PCI domain
     device pci 0.0 on end		# Host bridge
-    chip drivers/pci/onboard		# Onboard VGA
-      device pci 2.0 on end		# VGA (Intel 82830 CGC)
-    end
+    device pci 2.0 on end		# VGA (Intel 82830 CGC)
     chip southbridge/intel/i82801xx	# Southbridge
       register "pirqa_routing" = "0x05"
       register "pirqb_routing" = "0x06"
Index: svn/src/mainboard/rca/rm4100/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/rca/rm4100/devicetree.cb
+++ svn/src/mainboard/rca/rm4100/devicetree.cb
@@ -1,9 +1,7 @@ 
 chip northbridge/intel/i82830		# Northbridge
   device pci_domain 0 on		# PCI domain
     device pci 0.0 on end		# Host bridge
-    chip drivers/pci/onboard		# Onboard VGA
-      device pci 2.0 on end		# VGA (Intel 82830 CGC)
-    end
+    device pci 2.0 on end		# VGA (Intel 82830 CGC)
     chip southbridge/intel/i82801xx	# Southbridge
       register "pirqa_routing" = "0x05"
       register "pirqb_routing" = "0x06"
Index: svn/src/mainboard/supermicro/h8dme/Config.lb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/Config.lb
+++ svn/src/mainboard/supermicro/h8dme/Config.lb
@@ -254,9 +254,7 @@  chip northbridge/amd/amdk8/root_complex
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/supermicro/h8dme/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/devicetree.cb
+++ svn/src/mainboard/supermicro/h8dme/devicetree.cb
@@ -92,9 +92,7 @@  chip northbridge/amd/amdk8/root_complex
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/supermicro/h8dmr/Config.lb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/Config.lb
+++ svn/src/mainboard/supermicro/h8dmr/Config.lb
@@ -276,9 +276,7 @@  chip northbridge/amd/amdk8/root_complex
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/supermicro/h8dmr/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ svn/src/mainboard/supermicro/h8dmr/devicetree.cb
@@ -112,9 +112,7 @@  chip northbridge/amd/amdk8/root_complex
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/supermicro/h8dmr_fam10/Config.lb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/Config.lb
+++ svn/src/mainboard/supermicro/h8dmr_fam10/Config.lb
@@ -280,9 +280,7 @@  chip northbridge/amd/amdfam10/root_compl
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ svn/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
@@ -114,9 +114,7 @@  chip northbridge/amd/amdfam10/root_compl
 	                		device pci 5.1 on end # SATA 1
 	                		device pci 5.2 on end # SATA 2
                 			device pci 6.0 on  # PCI
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
         	        		device pci 6.1 on end # AZA
 	                		device pci 8.0 on end # NIC
Index: svn/src/mainboard/technexion/tim5690/Config.lb
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/Config.lb
+++ svn/src/mainboard/technexion/tim5690/Config.lb
@@ -155,9 +155,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/technexion/tim5690/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/devicetree.cb
+++ svn/src/mainboard/technexion/tim5690/devicetree.cb
@@ -20,9 +20,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/technexion/tim8690/Config.lb
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/Config.lb
+++ svn/src/mainboard/technexion/tim8690/Config.lb
@@ -155,9 +155,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/technexion/tim8690/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/devicetree.cb
+++ svn/src/mainboard/technexion/tim8690/devicetree.cb
@@ -20,9 +20,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/rs690
 					device pci 0.0 on end # HT  	0x7910
 					device pci 1.0 on  # Internal Graphics P2P bridge 0x7912
-						chip drivers/pci/onboard
-							device pci 5.0 on end	# Internal Graphics 0x791F
-						end
+						device pci 5.0 on end	# Internal Graphics 0x791F
 					end
 					device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x7913
 					device pci 3.0 off end # PCIE P2P bridge	0x791b
Index: svn/src/mainboard/technologic/ts5300/Config.lb
===================================================================
--- svn.orig/src/mainboard/technologic/ts5300/Config.lb
+++ svn/src/mainboard/technologic/ts5300/Config.lb
@@ -104,12 +104,6 @@  chip cpu/amd/sc520
 	device pci_domain 0 on 
 		device pci 0.0 on end
 	
-#		chip drivers/pci/onboard
-#			device pci 12.0 on end # enet
-#		end
-#		chip drivers/pci/onboard
-#			device pci 14.0 on end # 69000
-#		end
 #		register "com1" = "{1}"
 #		register "com1" = "{1, 0, 0x3f8, 4}"
 	end
Index: svn/src/mainboard/technologic/ts5300/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/technologic/ts5300/devicetree.cb
+++ svn/src/mainboard/technologic/ts5300/devicetree.cb
@@ -2,12 +2,6 @@  chip cpu/amd/sc520
 	device pci_domain 0 on 
 		device pci 0.0 on end
 	
-#		chip drivers/pci/onboard
-#			device pci 12.0 on end # enet
-#		end
-#		chip drivers/pci/onboard
-#			device pci 14.0 on end # 69000
-#		end
 #		register "com1" = "{1}"
 #		register "com1" = "{1, 0, 0x3f8, 4}"
 	end
Index: svn/src/mainboard/thomson/ip1000/Config.lb
===================================================================
--- svn.orig/src/mainboard/thomson/ip1000/Config.lb
+++ svn/src/mainboard/thomson/ip1000/Config.lb
@@ -75,9 +75,7 @@  config chip.h
 chip northbridge/intel/i82830		# Northbridge
   device pci_domain 0 on		# PCI domain
     device pci 0.0 on end		# Host bridge
-    chip drivers/pci/onboard		# Onboard VGA
-      device pci 2.0 on end		# VGA (Intel 82830 CGC)
-    end
+    device pci 2.0 on end		# VGA (Intel 82830 CGC)
     chip southbridge/intel/i82801xx	# Southbridge
       register "pirqa_routing" = "0x05"
       register "pirqb_routing" = "0x06"
Index: svn/src/mainboard/thomson/ip1000/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/thomson/ip1000/devicetree.cb
+++ svn/src/mainboard/thomson/ip1000/devicetree.cb
@@ -1,9 +1,7 @@ 
 chip northbridge/intel/i82830		# Northbridge
   device pci_domain 0 on		# PCI domain
     device pci 0.0 on end		# Host bridge
-    chip drivers/pci/onboard		# Onboard VGA
-      device pci 2.0 on end		# VGA (Intel 82830 CGC)
-    end
+    device pci 2.0 on end		# VGA (Intel 82830 CGC)
     chip southbridge/intel/i82801xx	# Southbridge
       register "pirqa_routing" = "0x05"
       register "pirqb_routing" = "0x06"
Index: svn/src/mainboard/tyan/s2850/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2850/Config.lb
+++ svn/src/mainboard/tyan/s2850/Config.lb
@@ -119,9 +119,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.2 off end
 						device pci 1.0 off end
                                                 #chip drivers/ati/ragexl
-						chip drivers/pci/onboard
-                                                        device pci b.0 on end
-                                                end
+                                                device pci b.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2850/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2850/devicetree.cb
+++ svn/src/mainboard/tyan/s2850/devicetree.cb
@@ -17,9 +17,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.2 off end
 						device pci 1.0 off end
                                                 #chip drivers/ati/ragexl
-						chip drivers/pci/onboard
-                                                        device pci b.0 on end
-                                                end
+                                                device pci b.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2875/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2875/Config.lb
+++ svn/src/mainboard/tyan/s2875/Config.lb
@@ -123,9 +123,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end
-                                                end
+                                                device pci 5.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2875/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2875/devicetree.cb
+++ svn/src/mainboard/tyan/s2875/devicetree.cb
@@ -21,9 +21,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end
-                                                end
+                                                device pci 5.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2880/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2880/Config.lb
+++ svn/src/mainboard/tyan/s2880/Config.lb
@@ -113,10 +113,8 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end #broadcom
-							device pci 9.1 on end 
-                                                end
+                                                device pci 9.0 on end #broadcom
+						device pci 9.1 on end
 #                                                chip drivers/lsi/53c1030
 #                                                        device pci a.0 on end
 #                                                        device pci a.1 on end
@@ -135,12 +133,8 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end #some sata
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end #adti
-                                                end
+                                                device pci 5.0 on end #some sata
+                                                device pci 6.0 on end #adti
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2880/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2880/devicetree.cb
+++ svn/src/mainboard/tyan/s2880/devicetree.cb
@@ -11,10 +11,8 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end #broadcom
-							device pci 9.1 on end 
-                                                end
+                                                device pci 9.0 on end #broadcom
+						device pci 9.1 on end
 #                                                chip drivers/lsi/53c1030
 #                                                        device pci a.0 on end
 #                                                        device pci a.1 on end
@@ -33,12 +31,8 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end #some sata
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end #adti
-                                                end
+                                                device pci 5.0 on end #some sata
+                                                device pci 6.0 on end #adti
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2881/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2881/Config.lb
+++ svn/src/mainboard/tyan/s2881/Config.lb
@@ -115,14 +115,10 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # Broadcom 5704
-                                                        device pci 9.1 on end
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci a.0 on end # Adaptic
-                                                        device pci a.1 on end
-                                                end
+                                                device pci 9.0 on end # Broadcom 5704
+                                                device pci 9.1 on end
+                                                device pci a.0 on end # Adaptic
+                                                device pci a.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -136,12 +132,8 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end # SiI
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 5.0 on end # SiI
+                                                device pci 6.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2881/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2881/devicetree.cb
+++ svn/src/mainboard/tyan/s2881/devicetree.cb
@@ -13,14 +13,10 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # Broadcom 5704
-                                                        device pci 9.1 on end
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci a.0 on end # Adaptic
-                                                        device pci a.1 on end
-                                                end
+                                                device pci 9.0 on end # Broadcom 5704
+                                                device pci 9.1 on end
+                                                device pci a.0 on end # Adaptic
+                                                device pci a.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -34,12 +30,8 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end # SiI
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 5.0 on end # SiI
+                                                device pci 6.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2882/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2882/Config.lb
+++ svn/src/mainboard/tyan/s2882/Config.lb
@@ -114,14 +114,10 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                chip drivers/pci/onboard 
-                                                        device pci 6.0 on end # adaptec
-                                                        device pci 6.1 on end
-                                                end 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # broadcom 5704
-                                                        device pci 9.1 on end
-                                                end
+                                                device pci 6.0 on end # adaptec
+                                                device pci 6.1 on end
+                                                device pci 9.0 on end # broadcom 5704
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -135,16 +131,11 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard  
-                                                        device pci 5.0 on end
-                                                end
+                                                device pci 5.0 on end
                                         #       chip drivers/ati/ragexl
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
-                                                chip drivers/pci/onboard 
-                                                        device pci 8.0 on end #intel 10/100
-                                                end
+                                                device pci 6.0 on end
+                                        #       end
+                                                device pci 8.0 on end #intel 10/100
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2882/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2882/devicetree.cb
+++ svn/src/mainboard/tyan/s2882/devicetree.cb
@@ -12,14 +12,10 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on
-                                                chip drivers/pci/onboard 
-                                                        device pci 6.0 on end # adaptec
-                                                        device pci 6.1 on end
-                                                end 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # broadcom 5704
-                                                        device pci 9.1 on end
-                                                end
+                                                device pci 6.0 on end # adaptec
+                                                device pci 6.1 on end
+                                                device pci 9.0 on end # broadcom 5704
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -33,16 +29,11 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard  
-                                                        device pci 5.0 on end
-                                                end
+                                                device pci 5.0 on end
                                         #       chip drivers/ati/ragexl
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
-                                                chip drivers/pci/onboard 
-                                                        device pci 8.0 on end #intel 10/100
-                                                end
+                                                device pci 6.0 on end
+                                        #       end
+                                                device pci 8.0 on end #intel 10/100
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2912_fam10/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/Config.lb
+++ svn/src/mainboard/tyan/s2912_fam10/Config.lb
@@ -279,9 +279,7 @@  chip northbridge/amd/amdfam10/root_compl
 					device pci 5.1 on end # SATA 1
 					device pci 5.2 on end # SATA 2
 					device pci 6.0 on
-						chip drivers/pci/onboard
-							device pci 4.0 on end
-						end
+						device pci 4.0 on end
 					end # PCI
 					device pci 6.1 off end # AZA
 					device pci 8.0 on end # NIC
Index: svn/src/mainboard/tyan/s2912_fam10/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/devicetree.cb
+++ svn/src/mainboard/tyan/s2912_fam10/devicetree.cb
@@ -112,9 +112,7 @@  chip northbridge/amd/amdfam10/root_compl
 					device pci 5.1 on end # SATA 1
 					device pci 5.2 on end # SATA 2
 					device pci 6.0 on
-						chip drivers/pci/onboard
-							device pci 4.0 on end
-						end
+						device pci 4.0 on end
 					end # PCI
 					device pci 6.1 off end # AZA
 					device pci 8.0 on end # NIC
Index: svn/src/mainboard/tyan/s4880/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s4880/Config.lb
+++ svn/src/mainboard/tyan/s4880/Config.lb
@@ -116,10 +116,8 @@  chip northbridge/amd/amdk8/root_complex
 #                                                        device pci 4.1 on end
 #                                                        register "fw_address" = "0xfff8c000"
 #                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end
-                                                        device pci 9.1 on end
-                                                end
+                                                device pci 9.0 on end
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -133,9 +131,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s4880/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s4880/devicetree.cb
+++ svn/src/mainboard/tyan/s4880/devicetree.cb
@@ -19,10 +19,8 @@  chip northbridge/amd/amdk8/root_complex
 #                                                        device pci 4.1 on end
 #                                                        register "fw_address" = "0xfff8c000"
 #                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end
-                                                        device pci 9.1 on end
-                                                end
+                                                device pci 9.0 on end
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -36,9 +34,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
+                                                device pci 6.0 on end
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s4882/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s4882/Config.lb
+++ svn/src/mainboard/tyan/s4882/Config.lb
@@ -114,10 +114,8 @@  chip northbridge/amd/amdk8/root_complex
 #							device pci 4.1 on end
 #							register "fw_address" = "0xfff8c000"
 #						end
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end #Broadcom
-                                                        device pci 9.1 on end
-                                                end 
+                                                device pci 9.0 on end #Broadcom
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -132,12 +130,9 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.2 off end
 						device pci 1.0 off end
                                                 #chip drivers/ati/ragexl
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end #SiI
-                                                end
+                                                device pci 6.0 on end
+                                                #end
+                                                device pci 5.0 on end #SiI
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s4882/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s4882/devicetree.cb
+++ svn/src/mainboard/tyan/s4882/devicetree.cb
@@ -17,10 +17,8 @@  chip northbridge/amd/amdk8/root_complex
 #							device pci 4.1 on end
 #							register "fw_address" = "0xfff8c000"
 #						end
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end #Broadcom
-                                                        device pci 9.1 on end
-                                                end 
+                                                device pci 9.0 on end #Broadcom
+                                                device pci 9.1 on end
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -35,12 +33,9 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.2 off end
 						device pci 1.0 off end
                                                 #chip drivers/ati/ragexl
-                                                chip drivers/pci/onboard
-                                                        device pci 6.0 on end
-                                                end
-                                                chip drivers/pci/onboard
-                                                        device pci 5.0 on end #SiI
-                                                end
+                                                device pci 6.0 on end
+                                                #end
+                                                device pci 5.0 on end #SiI
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/via/vt8454c/Config.lb
===================================================================
--- svn.orig/src/mainboard/via/vt8454c/Config.lb
+++ svn/src/mainboard/via/vt8454c/Config.lb
@@ -121,9 +121,7 @@  chip northbridge/via/cx700
 		device pci 0.4 on end # Power Management
 		device pci 0.7 on end # V-Link Controller
 		device pci 1.0 on     # PCI Bridge
-			chip drivers/pci/onboard
-				device pci 0.0 on end
-			end # Onboard Video
+			device pci 0.0 on end # Onboard Video
 		end # PCI Bridge
 		device pci f.0 on end # IDE/SATA
 		#device pci f.1 on end # IDE
Index: svn/src/mainboard/via/vt8454c/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/via/vt8454c/devicetree.cb
+++ svn/src/mainboard/via/vt8454c/devicetree.cb
@@ -12,9 +12,7 @@  chip northbridge/via/cx700
 		device pci 0.4 on end # Power Management
 		device pci 0.7 on end # V-Link Controller
 		device pci 1.0 on     # PCI Bridge
-			chip drivers/pci/onboard
-				device pci 0.0 on end
-			end # Onboard Video
+			device pci 0.0 on end # Onboard Video
 		end # PCI Bridge
 		device pci f.0 on end # IDE/SATA
 		#device pci f.1 on end # IDE
Index: svn/src/devices/pci_device.c
===================================================================
--- svn.orig/src/devices/pci_device.c
+++ svn/src/devices/pci_device.c
@@ -285,11 +285,6 @@  static void pci_get_rom_resource(struct 
 	unsigned long value;
 	resource_t moving;
 
-	if ((dev->on_mainboard) && (dev->rom_address == 0)) {
-		/* Skip it if rom_address is not set in the MB Config.lb. */
-		return;
-	}
-
 	/* Initialize the resources to nothing. */
 	resource = new_resource(dev, index);
 
@@ -326,18 +321,6 @@  static void pci_get_rom_resource(struct 
 		}
 		resource->flags = 0;
 	}
-
-	/* For on board device with embedded ROM image, the ROM image is at
-	 * fixed address specified in the Config.lb, the dev->rom_address is
-	 * inited by driver_pci_onboard_ops::enable_dev() */
-	if ((dev->on_mainboard) && (dev->rom_address != 0)) {
-		resource->base = dev->rom_address;
-		/* The resource allocator needs the size to be non-zero. */
-		resource->size = 0x100;
-		resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY |
-		    IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
-	}
-
 	compact_resources(dev);
 }
 
Index: svn/src/devices/pci_rom.c
===================================================================
--- svn.orig/src/devices/pci_rom.c
+++ svn/src/devices/pci_rom.c
@@ -31,42 +31,37 @@ 
 
 struct rom_header * pci_rom_probe(struct device *dev)
 {
-	unsigned long rom_address = 0;
 	struct rom_header *rom_header;
 	struct pci_data *rom_data;
 
-	void *v;
-	/* if it's in FLASH, then it's as if dev->on_mainboard was true */
-	v = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
-	printk_debug("In cbfs, rom address for %s = %p\n", 
-			dev_path(dev), v);
-	if (v) {
-		dev->rom_address = (u32)v;
-		dev->on_mainboard = 1;
-	}
+	/* If it's in FLASH, then don't check device for ROM. */
+	rom_header = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
 
-	if (dev->on_mainboard) {
-                // in case some device PCI_ROM_ADDRESS can not be set or readonly 
-		rom_address = dev->rom_address;
-		printk_debug("On mainboard, rom address for %s = %lx\n", 
-			dev_path(dev), rom_address);
+	if (rom_header) {
+		printk_debug("In cbfs, rom address for %s = %p\n",
+			     dev_path(dev), rom_header);
 	} else {
+		unsigned long rom_address;
+
 		rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
-		printk_debug("On card, rom address for %s = %lx\n", 
-				dev_path(dev), rom_address);
-	}
 
-	if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
-		return NULL;
-	}
+		if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
+			#if CONFIG_BOARD_EMULATION_QEMU_X86
+			rom_address = 0xc0000;
+			#else
+			return NULL;
+			#endif
+		} else {
+			/* enable expansion ROM address decoding */
+			pci_write_config32(dev, PCI_ROM_ADDRESS,
+					   rom_address|PCI_ROM_ADDRESS_ENABLE);
+		}
 
-	if(!dev->on_mainboard) {
-		/* enable expansion ROM address decoding */
-		pci_write_config32(dev, PCI_ROM_ADDRESS,
-				   rom_address|PCI_ROM_ADDRESS_ENABLE);
+		printk_debug("On card, rom address for %s = %lx\n",
+				dev_path(dev), rom_address);
+		rom_header = (struct rom_header *)rom_address;
 	}
 
-	rom_header = (struct rom_header *)rom_address;
 	printk_spew("PCI Expansion ROM, signature 0x%04x, INIT size 0x%04x, data ptr 0x%04x\n",
 		    le32_to_cpu(rom_header->signature),
 		    rom_header->size * 512, le32_to_cpu(rom_header->data));
@@ -76,11 +71,12 @@  struct rom_header * pci_rom_probe(struct
 		return NULL;
 	}
 
-	rom_data = (struct pci_data *) ((void *)rom_header + le32_to_cpu(rom_header->data));
+	rom_data = (((void *)rom_header) + le32_to_cpu(rom_header->data));
+
 	printk_spew("PCI ROM Image, Vendor %04x, Device %04x,\n",
 		    rom_data->vendor, rom_data->device);
 	if (dev->vendor != rom_data->vendor || dev->device != rom_data->device) {
-		printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n",
+		printk_err("ID mismatch: Vendor ID %04x, Device ID %04x\n",
 			   rom_data->vendor, rom_data->device);
 		return NULL;
 	}
@@ -90,7 +86,8 @@  struct rom_header * pci_rom_probe(struct
 		    rom_data->type);
 	if (dev->class != ((rom_data->class_hi << 8) | rom_data->class_lo)) {
 		printk_debug("Class Code mismatch ROM %08x, dev %08x\n", 
-			    (rom_data->class_hi << 8) | rom_data->class_lo, dev->class);
+			     (rom_data->class_hi << 8) | rom_data->class_lo,
+			     dev->class);
 		//return NULL;
 	}
 
Index: svn/src/drivers/pci/onboard/Config.lb
===================================================================
--- svn.orig/src/drivers/pci/onboard/Config.lb
+++ /dev/null
@@ -1,4 +0,0 @@ 
-config chip.h
-
-object onboard.o
-
Index: svn/src/drivers/pci/onboard/Makefile.inc
===================================================================
--- svn.orig/src/drivers/pci/onboard/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@ 
-obj-y += onboard.o
Index: svn/src/drivers/pci/onboard/chip.h
===================================================================
--- svn.orig/src/drivers/pci/onboard/chip.h
+++ /dev/null
@@ -1,11 +0,0 @@ 
-#ifndef PCI_ONBOARD_H
-#define PCI_ONBOARD_H
-
-struct drivers_pci_onboard_config 
-{
-       unsigned long rom_address;
-};
-struct chip_operations;
-extern struct chip_operations drivers_pci_onboard_ops;
-
-#endif 
Index: svn/src/drivers/pci/onboard/onboard.c
===================================================================
--- svn.orig/src/drivers/pci/onboard/onboard.c
+++ /dev/null
@@ -1,78 +0,0 @@ 
-/*
- * Copyright 2004 Tyan Computer
- *  by yhlu@tyan.com
- */
-
-#include <console/console.h>
-
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "chip.h"
-
-/*
- * How to use the onboard device driver for option rom execution:
- *
- * 1. You need to add the driver to your mainboard Config.lb:
- *
- *      chip drivers/pci/onboard
- *	    device pci x.0 on end
- *          register "rom_address" = "0xfff80000"
- *      end
- * 2. Reduce the size of your normal (or fallback) image, by adding the
- *    following lines to your target Config.lb, after romimage "normal"
- *      # 48K for SCSI FW or ATI ROM
- *      option CONFIG_ROM_SIZE = 512*1024-48*1024
- * 3. Create your vgabios.bin, for example using awardeco and put it in the
- *    directory of your target Config.lb. You can also read an option rom from
- *    a running system, but this is unreliable, as some option roms are changed
- *    during execution:
- *      #  dd if=/dev/mem of=atix.rom skip=1536 count=96
- * 4. After you built coreboot.rom, attach the option rom to your coreboot
- *    image:
- *      # cat ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > coreboot.rom
- *
- * Alternatively you can use the following script "nsxv" to build your image
- * Usage:
- * # ./nsxv s2850
- *     
- *     #!/bin/bash
- *     MBVENDOR=tyan
- *     MBMODEL=$1
- *     LBROOT=/home/yhlu/xx/xx
- *     
- *     echo $1
- *     date
- *     
- *     cd "$LBROOT/freebios2/targets"
- *     rm -rf "$MBVENDOR/$MBMODEL/$MBMODEL"
- *     ./buildtarget "$MBVENDOR/$MBMODEL" &> "$LBROOT/x_b.txt"
- *     cd "$MBVENDOR/$MBMODEL/$MBMODEL"
- *     #make clean
- *     eval make &> "$LBROOT/x_m.txt"
- *             if [ $? -eq 0 ]; then
- *                     echo "ok."
- *             else
- *                     echo "FAILED! Log excerpt:"
- *                     tail -n 15 "$LBROOT/x_m.txt"
- *                     exit
- *             fi
- *     cat ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > "$LBROOT/rom/"$MBMODEL"_coreboot.rom"
- *     cp -f "$LBROOT/rom/"$MBMODEL"_coreboot.rom" /home/yhlu/
- *     
- *     date
- *     
- */
-
-static void onboard_enable(device_t dev) 
-{
-	struct drivers_pci_onboard_config *conf;
-        conf = dev->chip_info;
-	dev->rom_address = conf->rom_address;
-}
-
-struct chip_operations drivers_pci_onboard_ops = {
-	CHIP_NAME("Onboard PCI")
-	.enable_dev = onboard_enable,
-};
Index: svn/src/mainboard/hp/dl145_g3/Config.lb
===================================================================
--- svn.orig/src/mainboard/hp/dl145_g3/Config.lb
+++ svn/src/mainboard/hp/dl145_g3/Config.lb
@@ -195,15 +195,6 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 2.1 on end # USB
 					device pci 2.2 on end # USB
 					device pci 3.0 on end # VGA
-					
-					#bx_a013+ start
-					#chip drivers/pci/onboard    #SATA2
-					#	device pci 5.0 on end
-					#	device pci 5.1 on end
-					#	device pci 5.2 on end
-					#	device pci 5.3 on end
-					#end
-					#bx_a013+ end
 				end
 			end
 			device pci 18.0 on end
Index: svn/src/mainboard/hp/dl145_g3/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/hp/dl145_g3/devicetree.cb
+++ svn/src/mainboard/hp/dl145_g3/devicetree.cb
@@ -72,15 +72,6 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 2.1 on end # USB
 					device pci 2.2 on end # USB
 					device pci 3.0 on end # VGA
-					
-					#bx_a013+ start
-					#chip drivers/pci/onboard    #SATA2
-					#	device pci 5.0 on end
-					#	device pci 5.1 on end
-					#	device pci 5.2 on end
-					#	device pci 5.3 on end
-					#end
-					#bx_a013+ end
 				end
 			end
 			device pci 18.0 on end
Index: svn/src/mainboard/intel/xe7501devkit/Config.lb
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/Config.lb
+++ svn/src/mainboard/intel/xe7501devkit/Config.lb
@@ -127,9 +127,7 @@  chip northbridge/intel/e7501
 			device pci 1d.1 off end # USB (not populated)
 			device pci 1d.2 off end # USB (not populated)
 			device pci 1e.0 on # Hub to PCI bridge
-				chip drivers/pci/onboard # VGA ROM
-					device pci 0.0 on end
-				end
+				device pci 0.0 on end
 			end
 			device pci 1f.0 on # LPC bridge
 				chip superio/smsc/lpc47b272
Index: svn/src/mainboard/intel/xe7501devkit/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/devicetree.cb
+++ svn/src/mainboard/intel/xe7501devkit/devicetree.cb
@@ -25,9 +25,7 @@  chip northbridge/intel/e7501
 			device pci 1d.1 off end # USB (not populated)
 			device pci 1d.2 off end # USB (not populated)
 			device pci 1e.0 on # Hub to PCI bridge
-				chip drivers/pci/onboard # VGA ROM
-					device pci 0.0 on end
-				end
+				device pci 0.0 on end
 			end
 			device pci 1f.0 on # LPC bridge
 				chip superio/smsc/lpc47b272
Index: svn/src/mainboard/newisys/khepri/Config.lb
===================================================================
--- svn.orig/src/mainboard/newisys/khepri/Config.lb
+++ svn/src/mainboard/newisys/khepri/Config.lb
@@ -98,8 +98,6 @@  end
 
 config chip.h
 
-# FIXME: ROM for onboard VGA
-
 chip northbridge/amd/amdk8/root_complex
 	device apic_cluster 0 on
 		chip cpu/amd/socket_940
Index: svn/src/mainboard/tyan/s2735/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2735/Config.lb
+++ svn/src/mainboard/tyan/s2735/Config.lb
@@ -100,10 +100,8 @@  chip northbridge/intel/e7501
         		chip southbridge/intel/i82870
         	        	device pci 1c.0 on end
 		                device pci 1d.0 on 
-					chip drivers/pci/onboard
-                                        	device pci 1.0 on end # intel lan
-                                                device pci 1.1 on end
-                                        end
+                                     	 device pci 1.0 on end # intel lan
+                                        device pci 1.1 on end
 				end
         	                device pci 1e.0 on end
         	                device pci 1f.0 on end
@@ -117,12 +115,8 @@  chip northbridge/intel/e7501
         	        device pci 1d.3 on end
 		        device pci 1d.7 on end
 		        device pci 1e.0 on 
-                        	chip drivers/pci/onboard
-                                	device pci 1.0 on end # intel lan 10/100
-                                end
-                                chip drivers/pci/onboard
-                                        device pci 2.0 on end # ati 
-                                end
+                             	device pci 1.0 on end # intel lan 10/100
+                                device pci 2.0 on end # ati
 			end
 		        device pci 1f.0 on
 				chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2735/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2735/devicetree.cb
+++ svn/src/mainboard/tyan/s2735/devicetree.cb
@@ -6,10 +6,8 @@  chip northbridge/intel/e7501
         		chip southbridge/intel/i82870
         	        	device pci 1c.0 on end
 		                device pci 1d.0 on 
-					chip drivers/pci/onboard
-                                        	device pci 1.0 on end # intel lan
-                                                device pci 1.1 on end
-                                        end
+                                     	 device pci 1.0 on end # intel lan
+                                        device pci 1.1 on end
 				end
         	                device pci 1e.0 on end
         	                device pci 1f.0 on end
@@ -23,12 +21,8 @@  chip northbridge/intel/e7501
         	        device pci 1d.3 on end
 		        device pci 1d.7 on end
 		        device pci 1e.0 on 
-                        	chip drivers/pci/onboard
-                                	device pci 1.0 on end # intel lan 10/100
-                                end
-                                chip drivers/pci/onboard
-                                        device pci 2.0 on end # ati 
-                                end
+                             	device pci 1.0 on end # intel lan 10/100
+                                device pci 2.0 on end # ati
 			end
 		        device pci 1f.0 on
 				chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2885/Config.lb
===================================================================
--- svn.orig/src/mainboard/tyan/s2885/Config.lb
+++ svn/src/mainboard/tyan/s2885/Config.lb
@@ -121,9 +121,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # broadcom 5703
-                                                end
+                                                device pci 9.0 on end # broadcom 5703
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -137,9 +135,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci b.0 on end # SiI 3114
-                                                end
+                                                device pci b.0 on end # SiI 3114
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2885/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2885/devicetree.cb
+++ svn/src/mainboard/tyan/s2885/devicetree.cb
@@ -19,9 +19,7 @@  chip northbridge/amd/amdk8/root_complex
 				chip southbridge/amd/amd8131
 					# the on/off keyword is mandatory
 					device pci 0.0 on 
-                                                chip drivers/pci/onboard
-                                                        device pci 9.0 on end # broadcom 5703
-                                                end
+                                                device pci 9.0 on end # broadcom 5703
 					end
 					device pci 0.1 on end
 					device pci 1.0 on end
@@ -35,9 +33,7 @@  chip northbridge/amd/amdk8/root_complex
 						device pci 0.1 on end
 						device pci 0.2 off end
 						device pci 1.0 off end
-                                                chip drivers/pci/onboard
-                                                        device pci b.0 on end # SiI 3114
-                                                end
+                                                device pci b.0 on end # SiI 3114
 					end
 					device pci 1.0 on
 						chip superio/winbond/w83627hf
Index: svn/src/mainboard/tyan/s2891/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/devicetree.cb
+++ svn/src/mainboard/tyan/s2891/devicetree.cb
@@ -104,9 +104,7 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 8.0 on end # SATA 0
 					device pci 9.0 on  # PCI
 					#	chip drivers/ati/ragexl
-						chip drivers/pci/onboard
-							device pci 7.0 on end
-						end
+						device pci 7.0 on end
 					end
 					device pci a.0 off end # NIC
 					device pci b.0 off end # PCI E 3
@@ -127,10 +125,8 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 0.0 on end
 					device pci 0.1 on end
 					device pci 1.0 on
-						chip drivers/pci/onboard
-							device pci 9.0 on end
-							device pci 9.1 on end
-						end
+						device pci 9.0 on end
+						device pci 9.1 on end
 					end
 					device pci 1.1 on end
 				end
Index: svn/src/mainboard/tyan/s2892/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2892/devicetree.cb
+++ svn/src/mainboard/tyan/s2892/devicetree.cb
@@ -105,12 +105,9 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 8.0 on end # SATA 0
 					device pci 9.0 on  # PCI
 					#	chip drivers/ati/ragexl
-						chip drivers/pci/onboard
-							device pci 6.0 on end
-						end
-						chip drivers/pci/onboard
-							device pci 8.0 on end
-						end
+						device pci 6.0 on end
+					#	end
+						device pci 8.0 on end
 					end
 					device pci a.0 off end # NIC
 					device pci b.0 off end # PCI E 3
@@ -131,10 +128,8 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 0.0 on end
 					device pci 0.1 on end
 					device pci 1.0 on
-						chip drivers/pci/onboard
-							device pci 9.0 on end # broadcom 5704
-							device pci 9.1 on end
-						end
+						device pci 9.0 on end # broadcom 5704
+						device pci 9.1 on end
 					end
 					device pci 1.1 on end
 				end
Index: svn/src/mainboard/tyan/s2895/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/tyan/s2895/devicetree.cb
+++ svn/src/mainboard/tyan/s2895/devicetree.cb
@@ -111,10 +111,8 @@  chip northbridge/amd/amdk8/root_complex
 					device pci 0.0 on end
 					device pci 0.1 on end
 					device pci 1.0 on
-						chip drivers/pci/onboard
-							device pci 6.0 on end # lsi scsi
-							device pci 6.1 on end
-						end
+						device pci 6.0 on end # lsi scsi
+						device pci 6.1 on end
 					end
 					device pci 1.1 on end
 				end
Index: svn/src/mainboard/via/epia/Config.lb
===================================================================
--- svn.orig/src/mainboard/via/epia/Config.lb
+++ svn/src/mainboard/via/epia/Config.lb
@@ -96,10 +96,7 @@  chip northbridge/via/vt8601
 	device pci_domain 0 on
     		device pci 0.0 on end			# Northbridge
 #		device pci 0.1 on			# AGP bridge
-		#	chip drivers/pci/onboard	# Integrated VGA
-		#		device pci 0.0 on end
-		#		register "rom_adress" = "0xfff80000"
-		#	end
+		#	device pci 0.0 on end		# Integrated VGA
 #		end
 		chip southbridge/via/vt8231
 			register "enable_native_ide" = "0"
Index: svn/src/mainboard/via/epia/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/via/epia/devicetree.cb
+++ svn/src/mainboard/via/epia/devicetree.cb
@@ -2,10 +2,7 @@  chip northbridge/via/vt8601
 	device pci_domain 0 on
     		device pci 0.0 on end			# Northbridge
 #		device pci 0.1 on			# AGP bridge
-		#	chip drivers/pci/onboard	# Integrated VGA
-		#		device pci 0.0 on end
-		#		register "rom_adress" = "0xfff80000"
-		#	end
+		#	device pci 0.0 on end		# Integrated VGA
 #		end
 		chip southbridge/via/vt8231
 			register "enable_native_ide" = "0"
Index: svn/src/southbridge/nvidia/ck804/chip.h
===================================================================
--- svn.orig/src/southbridge/nvidia/ck804/chip.h
+++ svn/src/southbridge/nvidia/ck804/chip.h
@@ -7,8 +7,6 @@  struct southbridge_nvidia_ck804_config {
 	unsigned int ide1_enable : 1;
 	unsigned int sata0_enable : 1;
 	unsigned int sata1_enable : 1;
-	unsigned long nic_rom_address;
-	unsigned long raid_rom_address;
 	unsigned int mac_eeprom_smbus;
 	unsigned int mac_eeprom_addr;
 };
Index: svn/src/southbridge/nvidia/ck804/ck804.c
===================================================================
--- svn.orig/src/southbridge/nvidia/ck804/ck804.c
+++ svn/src/southbridge/nvidia/ck804/ck804.c
@@ -77,12 +77,10 @@  void ck804_enable(device_t dev)
 	case PCI_DEVICE_ID_NVIDIA_CK804_NIC:
 		devfn -= (9 << 3);
 		index = 10;
-		dev->rom_address = conf->nic_rom_address;
 		break;
 	case PCI_DEVICE_ID_NVIDIA_CK804_NIC_BRIDGE:
 		devfn -= (9 << 3);
 		index = 10;
-		dev->rom_address = conf->nic_rom_address;
 		break;
 	case PCI_DEVICE_ID_NVIDIA_CK804_ACI:
 		devfn -= (3 << 3);
@@ -95,7 +93,6 @@  void ck804_enable(device_t dev)
 	case PCI_DEVICE_ID_NVIDIA_CK804_IDE:
 		devfn -= (5 << 3);
 		index = 14;
-		dev->rom_address = conf->raid_rom_address;
 		break;
 	case PCI_DEVICE_ID_NVIDIA_CK804_SATA0:
 		devfn -= (6 << 3);
Index: svn/src/mainboard/artecgroup/dbe61/realmode/vgabios.c
===================================================================
--- svn.orig/src/mainboard/artecgroup/dbe61/realmode/vgabios.c
+++ svn/src/mainboard/artecgroup/dbe61/realmode/vgabios.c
@@ -74,36 +74,6 @@ 
   emulator to successfully run this bios.
 */
 
-
-
-
-/*
-  Modified to be an universal driver for loading VGA ROMs.
-  Aug 2006, anti.sullin@artecdesign.ee, Artec Design
-  
-  USAGE:
-  	define in your motherboard Config.lb file in device hierarchy 
-  	around the VGA pci device realmode chip and define its rom address.
-	Rom address is read from Config.lb, this rom is then copied to 0xC000 and then excecuted
-  	
-  		chip drivers/pci/realmode
-				device pci 1.1 on end  					# VGA
-				register "rom_address" = "0xfffc0000"	# at the beginning of 256k
-		end
-  	
-  	then, chip enable is called at this list first traversal, and this sets
-  	up device's init callback. Device init is called during last list traversal and
-  	so, other hw should be already initialized to run vga bios successfully.
-*/
-
-
-
-
-
-
-
-
-
 /* Declare a temporary global descriptor table - necessary because the
    Core part of the bios no longer sets up any 16 bit segments */
 __asm__ (
@@ -918,8 +888,6 @@  static void vga_init(device_t dev)
 
 	// code to make vga init go through the emulator - as of yet this does not workfor the epia-m
 	dev->on_mainboard=1;
-	dev->rom_address = (void *)cfg->rom_address;
-
 	pci_dev_init(dev);
 
 	// code to make vga init run in real mode - does work but against the current coreboot philosophy 
Index: svn/src/mainboard/emulation/qemu-x86/mainboard.c
===================================================================
--- svn.orig/src/mainboard/emulation/qemu-x86/mainboard.c
+++ svn/src/mainboard/emulation/qemu-x86/mainboard.c
@@ -16,7 +16,6 @@  static void qemu_init(device_t dev)
 	 * force coreboot to use it.
 	 */
 	dev->on_mainboard = 1;
-	dev->rom_address = 0xc0000;
 
 	/* Now do the usual initialization */
 	pci_dev_init(dev);
Index: svn/src/northbridge/via/cn400/vga.c
===================================================================
--- svn.orig/src/northbridge/via/cn400/vga.c
+++ svn/src/northbridge/via/cn400/vga.c
@@ -121,15 +121,8 @@  static void vga_init(device_t dev)
 #endif
 }
 
-static void vga_read_resources(device_t dev)
-{
-	dev->rom_address = 0xfff80000;
-	dev->on_mainboard = 1;
-	pci_dev_read_resources(dev);
-}
-
 static const struct device_operations vga_operations = {
-	.read_resources   = vga_read_resources,
+	.read_resources   = pci_dev_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = vga_init,
Index: svn/src/northbridge/via/cn700/vga.c
===================================================================
--- svn.orig/src/northbridge/via/cn700/vga.c
+++ svn/src/northbridge/via/cn700/vga.c
@@ -101,15 +101,8 @@  static void vga_init(device_t dev)
 	memset(0xf0000, 0, 0x10000);
 }
 
-static void vga_read_resources(device_t dev)
-{
-	dev->rom_address = 0xfff80000;
-	dev->on_mainboard = 1;
-	pci_dev_read_resources(dev);
-}
-
 static const struct device_operations vga_operations = {
-	.read_resources   = vga_read_resources,
+	.read_resources   = pci_dev_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = vga_init,
Index: svn/src/northbridge/via/cx700/cx700_vga.c
===================================================================
--- svn.orig/src/northbridge/via/cx700/cx700_vga.c
+++ svn/src/northbridge/via/cx700/cx700_vga.c
@@ -97,15 +97,8 @@  static void vga_init(device_t dev)
 	outb(reg8, SR_DATA);
 }
 
-static void vga_read_resources(device_t dev)
-{
-	dev->rom_address = 0xfff80000;
-	dev->on_mainboard = 1;
-	pci_dev_read_resources(dev);
-}
-
 static struct device_operations vga_operations = {
-	.read_resources = vga_read_resources,
+	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = vga_init,
Index: svn/src/northbridge/via/vt8623/northbridge.c
===================================================================
--- svn.orig/src/northbridge/via/vt8623/northbridge.c
+++ svn/src/northbridge/via/vt8623/northbridge.c
@@ -124,9 +124,6 @@  static void vga_init(device_t dev)
 	
 #if 0
 	/* code to make vga init go through the emulator - as of yet this does not workfor the epia-m */
-	dev->on_mainboard=1;
-	dev->rom_address = (void *)0xfffc0000;
-
 	pci_dev_init(dev);
 	
 	call_bios_interrupt(0x10,0x4f1f,0x8003,1,0);
@@ -167,17 +164,8 @@  static void vga_init(device_t dev)
 #endif
 }
 
-static void vga_read_resources(device_t dev)
-{
-
-	dev->rom_address = (void *)0xfffc0000;
-	dev->on_mainboard=1;
-	pci_dev_read_resources(dev);
-
-}
-
 static struct device_operations vga_operations = {
-	.read_resources   = vga_read_resources,
+	.read_resources   = pci_dev_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init             = vga_init,
Index: svn/src/northbridge/via/vx800/vga.c
===================================================================
--- svn.orig/src/northbridge/via/vx800/vga.c
+++ svn/src/northbridge/via/vx800/vga.c
@@ -126,15 +126,8 @@  static void vga_init(device_t dev)
 
 }
 
-static void vga_read_resources(device_t dev)
-{
-	dev->rom_address = (void *)(0xffffffff - CONFIG_ROM_SIZE + 1);
-	dev->on_mainboard = 1;
-	pci_dev_read_resources(dev);
-}
-
 static struct device_operations vga_operations = {
-	.read_resources = vga_read_resources,
+	.read_resources = pci_dev_read_resources,
 	.set_resources = pci_dev_set_resources,
 	.enable_resources = pci_dev_enable_resources,
 	.init = vga_init,
Index: svn/src/drivers/Makefile.inc
===================================================================
--- svn.orig/src/drivers/Makefile.inc
+++ svn/src/drivers/Makefile.inc
@@ -1,3 +1,2 @@ 
-subdirs-y += pci
 subdirs-y += generic/debug
 subdirs-y += ati/ragexl
Index: svn/src/drivers/pci/Makefile.inc
===================================================================
--- svn.orig/src/drivers/pci/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@ 
-subdirs-y += onboard
Index: svn/src/include/device/device.h
===================================================================
--- svn.orig/src/include/device/device.h
+++ svn/src/include/device/device.h
@@ -70,7 +70,6 @@  struct device {
 	unsigned int    enabled : 1;	/* set if we should enable the device */
 	unsigned int    initialized : 1; /* set if we have initialized the device */
 	unsigned int    on_mainboard : 1;
-	unsigned long   rom_address;
 
 	u8 command;
 
Index: svn/src/mainboard/artecgroup/dbe61/realmode/chip.h
===================================================================
--- svn.orig/src/mainboard/artecgroup/dbe61/realmode/chip.h
+++ svn/src/mainboard/artecgroup/dbe61/realmode/chip.h
@@ -1,10 +1,6 @@ 
 #ifndef PCI_REALMODE_H
 #define PCI_REALMODE_H
 
-struct drivers_pci_realmode_config 
-{
-       unsigned long rom_address;
-};
 //struct chip_operations;
 extern struct chip_operations drivers_pci_realmode_ops;
 
Index: svn/src/mainboard/sunw/ultra40/Config.lb
===================================================================
--- svn.orig/src/mainboard/sunw/ultra40/Config.lb
+++ svn/src/mainboard/sunw/ultra40/Config.lb
@@ -210,8 +210,6 @@  chip northbridge/amd/amdk8/root_complex
         	                        register "ide1_enable" = "1"
                 	                register "sata0_enable" = "1"
                         	        register "sata1_enable" = "1"
-#					register "nic_rom_address" = "0xfff80000" # 64k
-#					register "raid_rom_address" = "0xfff90000"
 					register "mac_eeprom_smbus" = "3" # 1: smbus under 2e.8, 2: SM0 3: SM1
 					register "mac_eeprom_addr" = "0x51"
 				end
@@ -243,7 +241,6 @@  chip northbridge/amd/amdk8/root_complex
                                 	device pci c.0 off end # PCI E 2
                                 	device pci d.0 off end # PCI E 1
                                 	device pci e.0 on end # PCI E 0
-#					register "nic_rom_address" = "0xfff80000" # 64k
                                         register "mac_eeprom_smbus" = "3"
                                         register "mac_eeprom_addr" = "0x51"
                         	end
Index: svn/src/mainboard/sunw/ultra40/devicetree.cb
===================================================================
--- svn.orig/src/mainboard/sunw/ultra40/devicetree.cb
+++ svn/src/mainboard/sunw/ultra40/devicetree.cb
@@ -106,8 +106,6 @@  chip northbridge/amd/amdk8/root_complex
         	                        register "ide1_enable" = "1"
                 	                register "sata0_enable" = "1"
                         	        register "sata1_enable" = "1"
-#					register "nic_rom_address" = "0xfff80000" # 64k
-#					register "raid_rom_address" = "0xfff90000"
 					register "mac_eeprom_smbus" = "3" # 1: smbus under 2e.8, 2: SM0 3: SM1
 					register "mac_eeprom_addr" = "0x51"
 				end
@@ -139,7 +137,6 @@  chip northbridge/amd/amdk8/root_complex
                                 	device pci c.0 off end # PCI E 2
                                 	device pci d.0 off end # PCI E 1
                                 	device pci e.0 on end # PCI E 0
-#					register "nic_rom_address" = "0xfff80000" # 64k
                                         register "mac_eeprom_smbus" = "3"
                                         register "mac_eeprom_addr" = "0x51"
                         	end