diff options
| author | Sven Schnelle <svens@stackframe.org> | 2011-03-01 19:58:47 +0000 |
|---|---|---|
| committer | Sven Schnelle <svens@stackframe.org> | 2011-03-01 19:58:47 +0000 |
| commit | 91321028ec3fac017e8e2c47ec5fe7742409b3b0 (patch) | |
| tree | 738f9e0d9f124ef4670c5e21516695fc63fc6d46 /src/mainboard/amd | |
| parent | 270a908646273461b41e591739d778d3d675ff6f (diff) | |
| download | coreboot-91321028ec3fac017e8e2c47ec5fe7742409b3b0.tar.xz | |
Use subsystem id from devicetree.cb instead of Kconfig and move
all boards to the new config scheme.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6421 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/amd')
20 files changed, 10 insertions, 80 deletions
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig index d39da7bfdb..2118078dd0 100644 --- a/src/mainboard/amd/bimini_fam10/Kconfig +++ b/src/mainboard/amd/bimini_fam10/Kconfig @@ -91,14 +91,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/bimini_fam10/devicetree.cb b/src/mainboard/amd/bimini_fam10/devicetree.cb index 5916c9fb37..a5bec74e64 100644 --- a/src/mainboard/amd/bimini_fam10/devicetree.cb +++ b/src/mainboard/amd/bimini_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index d1e2649f8a..3d3a04cf62 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -59,12 +59,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_AMD_DBM690T diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb index d13c5dadc1..e1b01b2c06 100644 --- a/src/mainboard/amd/dbm690t/devicetree.cb +++ b/src/mainboard/amd/dbm690t/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs690 diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 8a2c83478d..8e4eca96b5 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM int default 0 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1510 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb index a0a19ea4e1..acae2ca42b 100644 --- a/src/mainboard/amd/inagua/devicetree.cb +++ b/src/mainboard/amd/inagua/devicetree.cb @@ -23,6 +23,7 @@ chip northbridge/amd/agesa_wrapper/family14/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x1510 inherit chip northbridge/amd/agesa_wrapper/family14 # CPU side of HT root complex # device pci 18.0 on # northbridge chip northbridge/amd/agesa_wrapper/family14 # PCI side of HT root complex diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig index 09adfcbaec..731002de4f 100644 --- a/src/mainboard/amd/mahogany/Kconfig +++ b/src/mainboard/amd/mahogany/Kconfig @@ -73,12 +73,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - endif # BOARD_AMD_MAHOGANY diff --git a/src/mainboard/amd/mahogany/devicetree.cb b/src/mainboard/amd/mahogany/devicetree.cb index 7965989617..d60d5a1f40 100644 --- a/src/mainboard/amd/mahogany/devicetree.cb +++ b/src/mainboard/amd/mahogany/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig index 0f6c6b37c6..9c2e081aac 100644 --- a/src/mainboard/amd/mahogany_fam10/Kconfig +++ b/src/mainboard/amd/mahogany_fam10/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/mahogany_fam10/devicetree.cb b/src/mainboard/amd/mahogany_fam10/devicetree.cb index d1f26d114a..c51e53e7c9 100644 --- a/src/mainboard/amd/mahogany_fam10/devicetree.cb +++ b/src/mainboard/amd/mahogany_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index 650e7aa543..66c37f29f4 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -118,14 +118,6 @@ config ACPI_SSDTX_NUM int default 0 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1510 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb index 48fd741ec8..8ca165b739 100644 --- a/src/mainboard/amd/persimmon/devicetree.cb +++ b/src/mainboard/amd/persimmon/devicetree.cb @@ -23,6 +23,7 @@ chip northbridge/amd/agesa_wrapper/family14/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x1510 inherit chip northbridge/amd/agesa_wrapper/family14 # CPU side of HT root complex # device pci 18.0 on # northbridge chip northbridge/amd/agesa_wrapper/family14 # PCI side of HT root complex diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index b9f37b3188..487a59935c 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -71,12 +71,4 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3050 - endif # BOARD_AMD_PISTACHIO diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb index 76f0fe7fc7..6608fddebf 100644 --- a/src/mainboard/amd/pistachio/devicetree.cb +++ b/src/mainboard/amd/pistachio/devicetree.cb @@ -15,6 +15,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3050 inherit chip northbridge/amd/amdk8 device pci 18.0 on # southbridge, K8 HT Configuration chip southbridge/amd/rs690 diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 6a4aea1abb..f08fd6e0c5 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -82,14 +82,6 @@ config IRQ_SLOT_COUNT int default 11 -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config ACPI_SSDTX_NUM int default 4 diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb index 8ea682fa5a..b819292d5d 100644 --- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index a49e3c9f38..4c9d2a06bf 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -84,14 +84,6 @@ config ACPI_SSDTX_NUM int default 5 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb index 7c36509bf8..bfbb2b309a 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig index 0d85f864df..b18115b8e9 100644 --- a/src/mainboard/amd/tilapia_fam10/Kconfig +++ b/src/mainboard/amd/tilapia_fam10/Kconfig @@ -79,14 +79,6 @@ config HEAP_SIZE hex default 0xc0000 -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x3060 - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - config RAMBASE hex default 0x200000 diff --git a/src/mainboard/amd/tilapia_fam10/devicetree.cb b/src/mainboard/amd/tilapia_fam10/devicetree.cb index 0a263610f1..aeb582a678 100644 --- a/src/mainboard/amd/tilapia_fam10/devicetree.cb +++ b/src/mainboard/amd/tilapia_fam10/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x1022 0x3060 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 |