Add (and use) the new PCI IDs:

- PCI_VENDOR_ID_CIRRUS
 - PCI_DEVICE_ID_CIRRUS_5446

Some minor cosmetic fixes (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@447 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Uwe Hermann 2007-07-12 01:03:05 +00:00
parent a167e27052
commit d8196e2580
4 changed files with 143 additions and 141 deletions

View file

@ -11,12 +11,6 @@
#ifndef DEVICE_PCI_IDS_H #ifndef DEVICE_PCI_IDS_H
#define DEVICE_PCI_IDS_H #define DEVICE_PCI_IDS_H
/*
* PCI Class, Vendor and Device IDs
*
* Please keep sorted.
*/
/* Device classes and subclasses. */ /* Device classes and subclasses. */
#define PCI_CLASS_NOT_DEFINED 0x0000 #define PCI_CLASS_NOT_DEFINED 0x0000
@ -158,4 +152,7 @@
#define PCI_DEVICE_ID_AMD_CS5536_OTG 0x2097 #define PCI_DEVICE_ID_AMD_CS5536_OTG 0x2097
#define PCI_DEVICE_ID_AMD_CS5536_B0_IDE 0x209A #define PCI_DEVICE_ID_AMD_CS5536_B0_IDE 0x209A
#define PCI_VENDOR_ID_CIRRUS 0x1013
#define PCI_DEVICE_ID_CIRRUS_5446 0x00b8 /* Used by QEMU */
#endif /* DEVICE_PCI_IDS_H */ #endif /* DEVICE_PCI_IDS_H */

View file

@ -19,9 +19,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o
STAGE0_MAINBOARD_OBJ :=\
$(obj)/mainboard/$(MAINBOARDDIR)/stage1.o
# #
# VPD or SIP ROM or... how does NVIDIA call it? # VPD or SIP ROM or... how does NVIDIA call it?
# Some space to cope with dirty southbridge tricks. # Some space to cope with dirty southbridge tricks.
@ -38,6 +37,7 @@ $(obj)/linuxbios.vpd:
# The initram file is always uncompressed. It belongs into the mainboard # The initram file is always uncompressed. It belongs into the mainboard
# directory and is built from what was auto.c in v2. # directory and is built from what was auto.c in v2.
# #
INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o
$(obj)/linuxbios.initram: $(obj)/stage0.init $(obj)/stage0.o $(INITRAM_OBJ) $(obj)/linuxbios.initram: $(obj)/stage0.init $(obj)/stage0.o $(INITRAM_OBJ)

View file

@ -17,9 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* no printk allowed until hardware is ready; hardware is ready */
/** /**
* start up hardware needed for stage1 * Start up hardware needed for stage1.
*
* No printk() allowed until hardware is ready; hardware is ready.
* TODO: Fix above comment? It's unclear.
*/ */
void hardware_stage1(void) void hardware_stage1(void)
{ {

View file

@ -23,6 +23,7 @@
#include <console.h> #include <console.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h>
#include <string.h> #include <string.h>
#include <keyboard.h> #include <keyboard.h>
@ -52,7 +53,9 @@ static struct device_operations qemuvga_pci_ops_dev = {
struct constructor qemuvga_constructors[] = { struct constructor qemuvga_constructors[] = {
{.id = {.type = DEVICE_ID_PCI, {.id = {.type = DEVICE_ID_PCI,
.u = {.pci = {.vendor = 0x1013,.device = 0x00b8}}}, .u = {.pci = {.vendor = PCI_VENDOR_ID_CIRRUS,
.device = PCI_DEVICE_ID_CIRRUS_5446}}},
&qemuvga_pci_ops_dev}, &qemuvga_pci_ops_dev},
{.ops = 0}, {.ops = 0},
}; };