Author: uwe
Date: 2008-10-13 23:41:24 +0200 (Mon, 13 Oct 2008)
New Revision: 3655

Modified:
   trunk/coreboot-v2/src/include/device/pci_ids.h
   trunk/coreboot-v2/src/southbridge/amd/rs690/rs690.h
   trunk/coreboot-v2/src/southbridge/amd/sb600/sb600.h
Log:
Move AMD RS690 and SB600 PCI IDs to pci_ids.h where they should be.

Build-tested with the AMD dbm690t board.

Signed-off-by: Uwe Hermann <[EMAIL PROTECTED]>
Acked-by: Marc Jones <[EMAIL PROTECTED]>



Modified: trunk/coreboot-v2/src/include/device/pci_ids.h
===================================================================
--- trunk/coreboot-v2/src/include/device/pci_ids.h      2008-10-13 13:08:38 UTC 
(rev 3654)
+++ trunk/coreboot-v2/src/include/device/pci_ids.h      2008-10-13 21:41:24 UTC 
(rev 3655)
@@ -283,6 +283,33 @@
 #define PCI_DEVICE_ID_ATI_RADEON_RC    0x5146
 #define PCI_DEVICE_ID_ATI_RADEON_RD    0x5147
 
+#define PCI_DEVICE_ID_ATI_SB600_LPC            0x438D
+#define PCI_DEVICE_ID_ATI_SB600_SATA           0x4380
+#define PCI_DEVICE_ID_ATI_SB600_IDE            0x438C
+#define PCI_DEVICE_ID_ATI_SB600_HDA            0x4383
+#define PCI_DEVICE_ID_ATI_SB600_ACI            0x4382
+#define PCI_DEVICE_ID_ATI_SB600_MCI            0x438E
+#define PCI_DEVICE_ID_ATI_SB600_USB2           0x4386
+#define PCI_DEVICE_ID_ATI_SB600_PCI            0x4384
+#define PCI_DEVICE_ID_ATI_SB600_SM             0x4385
+#define PCI_DEVICE_ID_ATI_SB600_USB_0          0x4387
+#define PCI_DEVICE_ID_ATI_SB600_USB_1          0x4388
+#define PCI_DEVICE_ID_ATI_SB600_USB_2          0x4389
+#define PCI_DEVICE_ID_ATI_SB600_USB_3          0x438A
+#define PCI_DEVICE_ID_ATI_SB600_USB_4          0x438B
+
+#define PCI_DEVICE_ID_ATI_RS690_HT             0x7910
+#define PCI_DEVICE_ID_ATI_RS690_PCIE           0x7912
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV2      0x7913
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV3      0x791B
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV4      0x7914
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV5      0x7915
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV6      0x7916
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV7      0x7917
+#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV8      0x7918
+#define PCI_DEVICE_ID_ATI_RS690_INT_GFX                0x791e
+#define PCI_DEVICE_ID_ATI_RS690MT_INT_GFX      0x791f
+
 #define PCI_VENDOR_ID_VLSI             0x1004
 #define PCI_DEVICE_ID_VLSI_82C592      0x0005
 #define PCI_DEVICE_ID_VLSI_82C593      0x0006

Modified: trunk/coreboot-v2/src/southbridge/amd/rs690/rs690.h
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/rs690/rs690.h 2008-10-13 13:08:38 UTC 
(rev 3654)
+++ trunk/coreboot-v2/src/southbridge/amd/rs690/rs690.h 2008-10-13 21:41:24 UTC 
(rev 3655)
@@ -21,20 +21,9 @@
 #define __RS690_H__
 
 #include <stdint.h>
+#include <device/pci_ids.h>
 #include "chip.h"
 
-#define PCI_DEVICE_ID_ATI_RS690_HT 0x7910
-#define PCI_DEVICE_ID_ATI_RS690_PCIE 0x7912
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV2 0x7913
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV3 0x791B
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV4 0x7914
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV5 0x7915
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV6 0x7916
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV7 0x7917
-#define PCI_DEVICE_ID_ATI_RS690_PCIE_DEV8 0x7918
-#define        PCI_DEVICE_ID_ATI_RS690_INT_GFX   0x791e
-#define        PCI_DEVICE_ID_ATI_RS690MT_INT_GFX         0x791f
-
 #define NBMISC_INDEX   0x60
 #define NBHTIU_INDEX   0xA8
 #define NBMC_INDEX             0xE8

Modified: trunk/coreboot-v2/src/southbridge/amd/sb600/sb600.h
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/sb600/sb600.h 2008-10-13 13:08:38 UTC 
(rev 3654)
+++ trunk/coreboot-v2/src/southbridge/amd/sb600/sb600.h 2008-10-13 21:41:24 UTC 
(rev 3655)
@@ -20,22 +20,9 @@
 #ifndef SB600_H
 #define SB600_H
 
+#include <device/pci_ids.h>
 #include "chip.h"
 
-#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D
-#define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380
-#define PCI_DEVICE_ID_ATI_SB600_IDE 0x438C
-#define PCI_DEVICE_ID_ATI_SB600_HDA 0x4383
-#define PCI_DEVICE_ID_ATI_SB600_ACI 0x4382
-#define PCI_DEVICE_ID_ATI_SB600_MCI 0x438E
-#define PCI_DEVICE_ID_ATI_SB600_USB2 0x4386
-#define PCI_DEVICE_ID_ATI_SB600_PCI  0x4384
-#define PCI_DEVICE_ID_ATI_SB600_SM 0x4385
-#define PCI_DEVICE_ID_ATI_SB600_USB_0 0x4387
-#define PCI_DEVICE_ID_ATI_SB600_USB_1 0x4388
-#define PCI_DEVICE_ID_ATI_SB600_USB_2 0x4389
-#define PCI_DEVICE_ID_ATI_SB600_USB_3 0x438A
-#define PCI_DEVICE_ID_ATI_SB600_USB_4 0x438B
 extern void pm_iowrite(u8 reg, u8 value);
 extern u8 pm_ioread(u8 reg);
 extern void pm2_iowrite(u8 reg, u8 value);


--
coreboot mailing list: coreboot@coreboot.org
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to