Remove drivers/pci/onboard. The only purpose was for option ROMs, which are
authorMyles Watson <mylesgw@gmail.com>
Fri, 6 Nov 2009 23:42:26 +0000 (23:42 +0000)
committerMyles Watson <mylesgw@gmail.com>
Fri, 6 Nov 2009 23:42:26 +0000 (23:42 +0000)
now handled more generically using CBFS.

Simplify the option ROM code in device/pci_rom.c, since there are only two ways
to get a ROM address now (CBFS and the device) and add an exception for qemu.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4925 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

107 files changed:
src/devices/pci_device.c
src/devices/pci_rom.c
src/drivers/Makefile.inc
src/drivers/pci/Makefile.inc [deleted file]
src/drivers/pci/onboard/Config.lb [deleted file]
src/drivers/pci/onboard/Makefile.inc [deleted file]
src/drivers/pci/onboard/chip.h [deleted file]
src/drivers/pci/onboard/onboard.c [deleted file]
src/include/device/device.h
src/mainboard/amd/dbm690t/Config.lb
src/mainboard/amd/dbm690t/devicetree.cb
src/mainboard/amd/pistachio/Config.lb
src/mainboard/amd/pistachio/devicetree.cb
src/mainboard/arima/hdama/Config.lb
src/mainboard/arima/hdama/devicetree.cb
src/mainboard/artecgroup/dbe61/realmode/chip.h
src/mainboard/artecgroup/dbe61/realmode/vgabios.c
src/mainboard/asi/mb_5blmp/Config.lb
src/mainboard/asi/mb_5blmp/devicetree.cb
src/mainboard/asus/mew-vm/Config.lb
src/mainboard/asus/mew-vm/devicetree.cb
src/mainboard/broadcom/blast/Config.lb
src/mainboard/broadcom/blast/devicetree.cb
src/mainboard/digitallogic/msm586seg/Config.lb
src/mainboard/digitallogic/msm586seg/devicetree.cb
src/mainboard/emulation/qemu-x86/mainboard.c
src/mainboard/gigabyte/ga_2761gxdk/Config.lb
src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb
src/mainboard/hp/dl145_g3/Config.lb
src/mainboard/hp/dl145_g3/devicetree.cb
src/mainboard/hp/e_vectra_p2706t/Config.lb
src/mainboard/hp/e_vectra_p2706t/devicetree.cb
src/mainboard/ibm/e326/Config.lb
src/mainboard/ibm/e326/devicetree.cb
src/mainboard/intel/d945gclf/Config.lb
src/mainboard/intel/d945gclf/devicetree.cb
src/mainboard/intel/xe7501devkit/Config.lb
src/mainboard/intel/xe7501devkit/devicetree.cb
src/mainboard/iwill/dk8_htx/Config.lb
src/mainboard/iwill/dk8_htx/devicetree.cb
src/mainboard/kontron/986lcd-m/Config.lb
src/mainboard/kontron/986lcd-m/devicetree.cb
src/mainboard/kontron/kt690/Config.lb
src/mainboard/kontron/kt690/devicetree.cb
src/mainboard/mitac/6513wu/Config.lb
src/mainboard/mitac/6513wu/devicetree.cb
src/mainboard/msi/ms6178/Config.lb
src/mainboard/msi/ms6178/devicetree.cb
src/mainboard/msi/ms9185/Config.lb
src/mainboard/msi/ms9185/devicetree.cb
src/mainboard/msi/ms9282/Config.lb
src/mainboard/msi/ms9282/devicetree.cb
src/mainboard/nec/powermate2000/Config.lb
src/mainboard/nec/powermate2000/devicetree.cb
src/mainboard/newisys/khepri/Config.lb
src/mainboard/rca/rm4100/Config.lb
src/mainboard/rca/rm4100/devicetree.cb
src/mainboard/sunw/ultra40/Config.lb
src/mainboard/sunw/ultra40/devicetree.cb
src/mainboard/supermicro/h8dme/Config.lb
src/mainboard/supermicro/h8dme/devicetree.cb
src/mainboard/supermicro/h8dmr/Config.lb
src/mainboard/supermicro/h8dmr/devicetree.cb
src/mainboard/supermicro/h8dmr_fam10/Config.lb
src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
src/mainboard/technexion/tim5690/Config.lb
src/mainboard/technexion/tim5690/devicetree.cb
src/mainboard/technexion/tim8690/Config.lb
src/mainboard/technexion/tim8690/devicetree.cb
src/mainboard/technologic/ts5300/Config.lb
src/mainboard/technologic/ts5300/devicetree.cb
src/mainboard/thomson/ip1000/Config.lb
src/mainboard/thomson/ip1000/devicetree.cb
src/mainboard/tyan/s2735/Config.lb
src/mainboard/tyan/s2735/devicetree.cb
src/mainboard/tyan/s2850/Config.lb
src/mainboard/tyan/s2850/devicetree.cb
src/mainboard/tyan/s2875/Config.lb
src/mainboard/tyan/s2875/devicetree.cb
src/mainboard/tyan/s2880/Config.lb
src/mainboard/tyan/s2880/devicetree.cb
src/mainboard/tyan/s2881/Config.lb
src/mainboard/tyan/s2881/devicetree.cb
src/mainboard/tyan/s2882/Config.lb
src/mainboard/tyan/s2882/devicetree.cb
src/mainboard/tyan/s2885/Config.lb
src/mainboard/tyan/s2885/devicetree.cb
src/mainboard/tyan/s2891/devicetree.cb
src/mainboard/tyan/s2892/devicetree.cb
src/mainboard/tyan/s2895/devicetree.cb
src/mainboard/tyan/s2912_fam10/Config.lb
src/mainboard/tyan/s2912_fam10/devicetree.cb
src/mainboard/tyan/s4880/Config.lb
src/mainboard/tyan/s4880/devicetree.cb
src/mainboard/tyan/s4882/Config.lb
src/mainboard/tyan/s4882/devicetree.cb
src/mainboard/via/epia/Config.lb
src/mainboard/via/epia/devicetree.cb
src/mainboard/via/vt8454c/Config.lb
src/mainboard/via/vt8454c/devicetree.cb
src/northbridge/via/cn400/vga.c
src/northbridge/via/cn700/vga.c
src/northbridge/via/cx700/cx700_vga.c
src/northbridge/via/vt8623/northbridge.c
src/northbridge/via/vx800/vga.c
src/southbridge/nvidia/ck804/chip.h
src/southbridge/nvidia/ck804/ck804.c

index 2360028756d57309b1eb92abba49d1ca7afc5103..3373c8481c2048b6cba6e519c47b79839b188b09 100644 (file)
@@ -285,11 +285,6 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index)
        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 device *dev, unsigned long index)
                }
                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 cafeed4897b2428a667937f45aa5802df09a2ba4..9b2d28112921a0b632cdfe657c4a4521d74d8b53 100644 (file)
 
 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 device *dev)
                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 device *dev)
                    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 ca2ce66f4a0c0f1945f717dd89c300d7570eb349..95a2afd63bc46156a523fe6a2bfb9accce0009e8 100644 (file)
@@ -1,3 +1,2 @@
-subdirs-y += pci
 subdirs-y += generic/debug
 subdirs-y += ati/ragexl
diff --git a/src/drivers/pci/Makefile.inc b/src/drivers/pci/Makefile.inc
deleted file mode 100644 (file)
index 09ac260..0000000
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-y += onboard
diff --git a/src/drivers/pci/onboard/Config.lb b/src/drivers/pci/onboard/Config.lb
deleted file mode 100644 (file)
index d249df4..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-config chip.h
-
-object onboard.o
-
diff --git a/src/drivers/pci/onboard/Makefile.inc b/src/drivers/pci/onboard/Makefile.inc
deleted file mode 100644 (file)
index 5a16314..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += onboard.o
diff --git a/src/drivers/pci/onboard/chip.h b/src/drivers/pci/onboard/chip.h
deleted file mode 100644 (file)
index f06f53e..0000000
+++ /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 
diff --git a/src/drivers/pci/onboard/onboard.c b/src/drivers/pci/onboard/onboard.c
deleted file mode 100644 (file)
index 58e6816..0000000
+++ /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 25a549cc72682864d614c07062d2b1120d0f39e8..d0cc370980462639e3e724a81d9900a39ad9cb56 100644 (file)
@@ -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 8fffd8041164b4b6a4cd3b18528a72b05b3e366b..fde48a1cc2afddf5e33994aa4369782cf7f46ea5 100644 (file)
@@ -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 10de5c16c859733593ca018ac4986ee04bd899f2..a12e82db13480c81fda37e30a9741531ce753e67 100644 (file)
@@ -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 93925fa9afb3e84b936c7bdf5e1cdc72c981d0cc..1f59668328d916614d8984554d655162d42fbc26 100644 (file)
@@ -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 ab915764b388655822f528540a0c0d5916a65a30..139a17e836cb2feef73a2488d726bb07ae78ced1 100644 (file)
@@ -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 7df39865fe20577f28da8c1d4b5aa2bec894f87e..13e351f7d70df70de2788bbb00eae59cd20a12ec 100644 (file)
@@ -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 ac09e730aef102f5d249765fc38689ffc7c6082f..a8128147827dae3a506db0a7a4cd0b79ee448778 100644 (file)
@@ -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 ba2725a2b452d0fc0bfe590b60a27da279716e0a..04d1452a633bec8a4de3bc8cf6434d2b8a58778e 100644 (file)
@@ -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 944e7c03e0044599e06d357729ab1ec9358d7f44..1a9dced09e679918382792315dab0715c424c83f 100644 (file)
   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 65e2fd4c0f650dbb71d6c02b5fb14dc59d30716a..93ac8e6fb6ebadde50c3e77d1fa9e3cc467744db 100644 (file)
@@ -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 0b1505a13607a161c49b4ad74400bddabb75a14f..ded603a5698bc5dec492e9bcb2ae413fedc79109 100644 (file)
@@ -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 e27f2d12cfbae5b6ba724af0eb8e2500aa94846b..3cd4db2e5f1f1ae7a2574542e5f499d84b404aa3 100644 (file)
@@ -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 650aad1c4203cb12dca628368ac0138a63f03d2c..0dc4b6f4688e73d6e9d7332ab9d6ef8a4bf8299a 100644 (file)
@@ -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 3b0d217437698d15d38e767ad47992460a9ab5a5..238596d2561a870f5f90a82e56a46e46464f528e 100644 (file)
@@ -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 b9dc91b720cfcea1a3a80c0660c4dfe613b2018a..a9cabe6bea7bcb74a51231bb4b7caece2a30e2ae 100644 (file)
@@ -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 ef8a0eb69c633c66e3fbb97bf9bf6efc4ccfd2a8..dbd3e64447c73a72ab42a3eee2d1067073bf0b89 100644 (file)
@@ -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 35db84ed8bd49d175d564cb179a6573f1ac6b415..05067ca632cfc91f9772f9bb67906728823e47a4 100644 (file)
@@ -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 5ee62e9df7b95f2b4db9068493e2038df2a61b92..4982b71b27f1c534db90937ed8c1b02e173c6d1a 100644 (file)
@@ -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 b043e275b59d93df750d8033359c6b6d416783dc..40a96f4ce1fef8d2322ab04cd3edb7ee37918acc 100644 (file)
@@ -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 5ab88f4a39bd95effa93b15fb2e93185e2759227..08670bdf78cd3bdc5ef3b2787f49e33386b96e31 100644 (file)
@@ -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 e0eb5d3ca864359f1c6af5eb1d421e13f5fc43be..6c0508e217038c35ae1dd07f302e8438b0e55aa2 100644 (file)
@@ -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 0d038d333eccd2b521d785fa88c63a50c627ed06..80b9b33f84c44ed3129b5a438f879f965dc62acf 100644 (file)
@@ -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 535c30caa0ac508f031915caff7152495a0610a6..c158b8178bc8fc9d7c61c1239959757a319a53e9 100644 (file)
@@ -76,9 +76,7 @@ chip northbridge/intel/i82810                 # Northbridge
   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 a10dee89fcc8488cd601f44573ea17e4153712d5..82209d4317e1fb2875cf3f2b761e39aa796b727f 100644 (file)
@@ -7,9 +7,7 @@ chip northbridge/intel/i82810                   # Northbridge
   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 39ba3e2fad162c8634af295002f1a7f31152cfcc..08109ee165e6e87518fed57d8e6b416b88f059c8 100644 (file)
@@ -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 2e634e0058953b73fcd14970982dbcfacc573fa9..a8576968cb283706d8699db191c9fed7bc692a3a 100644 (file)
@@ -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 d9eee75168e2670382e88eaeec2e9cf38c27b2de..1801753503b0a6061abd077cf097d4f22b000a66 100644 (file)
@@ -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 eeab074f56e7c832020ba074d94fa695e8b23548..af5f22b30239a829e1e1cdcc9b83e4e1bd6e0099 100644 (file)
@@ -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 bad246a0dfe05eb0fad60402aa51102745e524fd..1f0534c8c0cec10520d83768bfbdce275f8ade12 100644 (file)
@@ -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 e5873a23affe282c2874aa96588ab56d7b19c338..00ed4eca84b37020d6b757353fdae83ccb485f08 100644 (file)
@@ -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 fc55d57a23ea1ef7bd5fbd7e2a51423f12b996dd..c5019183dd55a84131b45579e93c80156573008f 100644 (file)
@@ -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 b1d0d79bf18f7bbdc41c95dffc3f61c5c256b16b..cfddca953dfbed05aa98540e4f874ab6f4987daa 100644 (file)
@@ -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 e89fc82c0e5f3e4320efe7dab12269934cac75e3..a5d48f9a4339b032a74e1ea45477a9d64ac0dfcf 100644 (file)
@@ -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 8cd34b4f964611f313148accbec848b449148166..3b4a5179fbef66af3db85a5ccc45b272a40ed3f6 100644 (file)
@@ -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 3a182b7ba96a9bf18fa1a6fb518e9015a78ca6cb..3cddb5166e914d337032d4a10ab9774f1db5174d 100644 (file)
@@ -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 5983bbafd942eaf5c4c57a43adc127622b691619..dc7df48f67a83bc980266132b62854f375698bd3 100644 (file)
@@ -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 9072349fc5c4b7be1295b9ab5d851b329b309cd9..a6480bd5852ef538d4148114db71b7e59bb079e9 100644 (file)
@@ -80,9 +80,7 @@ chip northbridge/intel/i82810           # Northbridge
   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 b78dd3aab949b5ec4b8e32c8e3cabe9d465d947d..0369775c0777b07ea95d6c6d3339901c47aaf644 100644 (file)
@@ -26,9 +26,7 @@ chip northbridge/intel/i82810           # Northbridge
   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 5c6f9c06bcd4a06d4a68e780e6f80b54755dc27d..3f77f30555b75dc07649b09c446acf31db1d66bb 100644 (file)
@@ -75,9 +75,7 @@ chip northbridge/intel/i82810                 # Northbridge
   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 1676ab5a9af4310d128ebedcb37bb695bde17c35..baa0e040b830c9e8f65f5dd8d950494354281dc5 100644 (file)
@@ -26,9 +26,7 @@ chip northbridge/intel/i82810                 # Northbridge
   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 0af1b60c4cea89371cb25e0132f2fcba9fdb9e31..c3bddcfe1fabc06c6800e2cf6d04151ec8611fe9 100644 (file)
@@ -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 3f02199d691ab73ecc63522628cdd32303795397..720075ba2a3f6be91e7c724a8e6a55d0fc215e3a 100644 (file)
@@ -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 c0c4ed10e642f4cfc6bf901335d765b08a034fef..8faf6117f4657e046ee8f66dc9aac7f80158093c 100644 (file)
@@ -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 bf334408e8981a9487b63d163aad2dec316da505..0287f13bf31630d240f7b269bc95d5392e3abe3f 100644 (file)
@@ -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 ff7543772003e0e94c5697f7d0fbe81f1c938593..e63b1475dd13075e7893f9a7d20aa4ae74a2689b 100644 (file)
@@ -75,11 +75,7 @@ chip northbridge/intel/i82810                        # Northbridge
   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 5af5986a5afb5735515d978b669df2a1edab0a8d..0cb7e328b5047364e959523758f38b662d9518ca 100644 (file)
@@ -6,11 +6,7 @@ chip northbridge/intel/i82810                  # Northbridge
   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 913f34a424a02f8b519a875aefc2bf275ae1921b..f053e669a9850d225395916bbe359711acd06145 100644 (file)
@@ -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 727077d6be8fab96a60e3b9fd9664f5b239a4ecc..648be3427f9a974755dee87b0224573b2ed4a682 100644 (file)
@@ -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 f67692d8df64fb08af8faa44ec1b2a285f93aead..1844932114dadb9b37767f640721901b36605773 100644 (file)
@@ -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 6fedd3a7ed613d834950d08648c4dbe727784cb3..b00c2bc331fc8815392a7c361e57475bc74dcac2 100644 (file)
@@ -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 01a59f714e17d91a0cfa83a98daa300a1e3956f8..afa6f66bebf6c1970741548a2e45012f7eecbf09 100644 (file)
@@ -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
index 2bc901af1089179f83ce344a3d1c0333a2443c32..21419079007332fc09e96f21f3c07a5e80c554b6 100644 (file)
@@ -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 6df22c4f444760996c2f0431bc032d702ae7b577..5d6776a3f288649c0363c431770883a34b367d48 100644 (file)
@@ -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 76f8e70aa150d1a28250c996964f1b147c68af83..cc95167ddf427aaf4bd98c83921451f6ccfe19ea 100644 (file)
@@ -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 9a09f1cc495de5a395bd779730477adc055b533a..d83f00637d2c0f9b7d97bce2abf9722c9dfbf57d 100644 (file)
@@ -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 31341bd0e13de1bee3f4ccc42936b54b0256be06..cd9dd541e23140c7831b92740b9e87ea7873672c 100644 (file)
@@ -280,9 +280,7 @@ chip northbridge/amd/amdfam10/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 35cf05235f08813e03477b7d88a9625433bd2af1..9b93eef5076ac6bbb916ea0acd36342b8788b313 100644 (file)
@@ -114,9 +114,7 @@ chip northbridge/amd/amdfam10/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 d400a2d6c9adbd4681443d12165fcd4bd1e6c014..d065ba954de8b8dd543ff4a18095c3199f0dd480 100644 (file)
@@ -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 8bd6fe1f9d6bcbb355c364621120030e6674dccc..ddad732f20d64f18a42103f506e334713c497be9 100644 (file)
@@ -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 8fffd8041164b4b6a4cd3b18528a72b05b3e366b..fde48a1cc2afddf5e33994aa4369782cf7f46ea5 100644 (file)
@@ -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 10de5c16c859733593ca018ac4986ee04bd899f2..a12e82db13480c81fda37e30a9741531ce753e67 100644 (file)
@@ -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 5b665f9ad7581a04bb455a1cdeb22ab8d4530532..fdc26ea8df135a51732c40112ebdad71c075a9ca 100644 (file)
@@ -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 5823155cdbdba91c96e0428664f83ab4f81d1cdf..65809cb2f48fedaf65d9126cf91179a3ad6e3bb8 100644 (file)
@@ -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 8eaa606ac49ac3edfe1d721ad6f54708d638b94d..a509341c0789ca4281e761826384efed38a4850b 100644 (file)
@@ -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 aa0f3f93daa61056355c5888b7ff83c74e35695c..7f5c42a8cf52207042df11920155a51aa99216ca 100644 (file)
@@ -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 ae5de634e825b722695d0f820143028784eedc11..4f9fc5b20b3c36a31d0eccda78afaf3832276deb 100644 (file)
@@ -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 d491f6c6eb6b74f39ffddcc4202dc01be0e8f44f..0fdd57814ac9d22f95a7e1d9c1dac72c5fcd3d46 100644 (file)
@@ -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 3eeb4319cb41a5f3714754557e042693ca58dfc2..eaa338e041c2717a6f3dfcf1d4a2835d8f74d4ae 100644 (file)
@@ -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 1f93df19d3eba85e819807c9f9c5257174ed4a1e..264f8c7df6c1ebdf840c261dbf53cba47fec8ed4 100644 (file)
@@ -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 f0d93d0b80091a6eee22e60174e24b8d037f1625..6145ba742817d3a4e42f6611e6a6b60fcd4ad902 100644 (file)
@@ -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 6c6bf69cfa1b3ffeedcab0fe4c2f8cfc632425c4..badb881777b8f3432cd14c12a4260fefb7cee9ba 100644 (file)
@@ -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 76018b156d61dc95584e53d204f694357212bbd1..5e72afbbfb3dcbc353c216c6a2725d191d491f73 100644 (file)
@@ -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 8593fb357341334513ede46e92ef90f0e91e76c8..122648e137749bd0f1f6e8704c714c3c41ebd676 100644 (file)
@@ -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 b959220f72fce25ba27a7655db14f2d9836ca1a1..a46e0ef661c448d8274d56440eabc3cb3c1fe044 100644 (file)
@@ -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 7f1453bfa31d2dcc6bdd010c419feea6ae30029b..3c1f5bc276ee02d7a657fc40651c241b18be6df1 100644 (file)
@@ -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 e92ea849487fae97b4c52fde8ccac8994b6cbd71..266733154e71e836420605661bfb6f53647f5148 100644 (file)
@@ -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 d4200d158e5e798a01d6d2abdccfe34d3ec80b12..d563232b2dbd057421779c12a53af95b476019a8 100644 (file)
@@ -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 012b09774beda06a7a11986ba4eb15273e337d99..26389a18cedbc1e74ec9c613186ebb7beb4cd688 100644 (file)
@@ -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 8a981500f164ef0040b63296aa94d22cf949880b..f8dc2215d98fd2e7aee4e3159900f004e72f6dce 100644 (file)
@@ -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 cd349da54854db0575d19bda3cc5274cebd4a51b..d7b980147f819189a910ad9e757c02059b4767ae 100644 (file)
@@ -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 518dae6a909276243b83135a31f28ae039c64617..a64c5470ee4c96fdf752f215e4862d19b73dc3d8 100644 (file)
@@ -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 6e4c2a63a123435418064aef9709b2c9aa5db1b4..d031947d2d4a245f30af74d89d84e56adad76d88 100644 (file)
@@ -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 49ae429bf54f3f2834c07d55b0d80490fae1c664..f3765f27f7972b0fbf9c976938af88d62880e776 100644 (file)
@@ -279,9 +279,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        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 4bce6b3e8913c5acf7d137fd0e89f4459dc828e0..a6a012a839bcb77b0958fff59527c72db8ca5352 100644 (file)
@@ -112,9 +112,7 @@ chip northbridge/amd/amdfam10/root_complex
                                        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 68efa3bba82cf4bb5a32ee51d0495af683daa78f..5e1aaf5130f9bb18d5198e582f48eda63c10864f 100644 (file)
@@ -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 d1e424b697aadd25af4a5e6cb537234051b97608..4a08e45d1b2b1a22fb98cac299ef7531c6ce731a 100644 (file)
@@ -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 48b2597451091a4c6b6e81251d62e598154f1fb3..bbb94f2116927e9a2a1815603b3eafa66e9bad6d 100644 (file)
@@ -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 d61865cdd53b168e65c7d8b591df4cadfa374b10..d2e5bbcf905f8efac385d34fbc24202fa7415316 100644 (file)
@@ -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 fdde8b3116435dd0c7baf962e6a51ad025ea7561..c75c21e0601a6669361f0403d524d76ba25b20b6 100644 (file)
@@ -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 b75ee5881a4aed4a6fae52e5858bd025fa9c472e..b97f4f27bff8daa764845420416d780b6d966a20 100644 (file)
@@ -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 3dd107ac52a1e7a4e438b6b961e786f40fed4062..6faa33c3b2fcb3bf9cb99faeff0698b9420d8a9e 100644 (file)
@@ -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 3ef59b52e17b0ec8a3a614a51ed2ce9469a86375..d308dbb77311c1cc2ae42415aa220d5d13acd17f 100644 (file)
@@ -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 6c61f3de5d7c62b0f5620a027fd01dfbd1017693..5a58d17550692fcdf4c74c9a9cbabf2b4e8bb653 100644 (file)
@@ -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 3c8fb61ce660a2a43e075874588b3f9b27453e92..e4f9d93b6fad9ca699be623bf2992e29c3ab0bdb 100644 (file)
@@ -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 96bb769e20f7f7a4a78829a222183c249a0e8914..bcb7d9e8a97357e878252147ec22b3fc3b16814a 100644 (file)
@@ -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 d384a9809cefe247dc14eec6748f10f5fdf01b65..15910fe74d8a774fa8a969c4b11728c5c0fd6af4 100644 (file)
@@ -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 a3bf81bd08acf7969f421333ba6eb8b57e4da769..732963de4654249390fff8af779a43413c858938 100644 (file)
@@ -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 ddbe6be981ba15b6b0ca30b99f139abad8e422bc..479f3ebbf4ddea6cbf1eee3586c2f578570f9c18 100644 (file)
@@ -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 4adf81930485185d5e887ef8f26ea8a5d0ba77fc..2c0d5a2067415f9dd29bddbbc9fca2ce98e021b1 100644 (file)
@@ -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);