From 91321028ec3fac017e8e2c47ec5fe7742409b3b0 Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Tue, 1 Mar 2011 19:58:47 +0000 Subject: Use subsystem id from devicetree.cb instead of Kconfig and move all boards to the new config scheme. Signed-off-by: Sven Schnelle Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6421 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/gigabyte/ga_2761gxdk/Kconfig | 8 -------- src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb | 1 + src/mainboard/gigabyte/m57sli/Kconfig | 8 -------- src/mainboard/gigabyte/m57sli/devicetree.cb | 1 + src/mainboard/gigabyte/ma785gmt/Kconfig | 8 -------- src/mainboard/gigabyte/ma785gmt/devicetree.cb | 1 + src/mainboard/gigabyte/ma78gm/Kconfig | 8 -------- src/mainboard/gigabyte/ma78gm/devicetree.cb | 1 + 8 files changed, 4 insertions(+), 32 deletions(-) (limited to 'src/mainboard/gigabyte') diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig index 6571b318ed..d25db854f2 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig @@ -78,14 +78,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1039 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x1234 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb index 62f9238b1c..e1aac4eb35 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb +++ b/src/mainboard/gigabyte/ga_2761gxdk/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex end end device pci_domain 0 on + subsystemid 0x1039 0x1234 inherit chip northbridge/amd/amdk8 #mc0 device pci 18.0 on # devices on link 0, link 0 == LDT 0 diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index e36dccc8da..7250a9c6df 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -82,14 +82,6 @@ config SERIAL_CPU_INIT bool default n -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1022 - -config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID - hex - default 0x2b80 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/gigabyte/m57sli/devicetree.cb b/src/mainboard/gigabyte/m57sli/devicetree.cb index 3bae560c68..2184de5050 100644 --- a/src/mainboard/gigabyte/m57sli/devicetree.cb +++ b/src/mainboard/gigabyte/m57sli/devicetree.cb @@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex end end device pci_domain 0 on # PCI domain + subsystemid 0x1022 0x2b80 inherit chip northbridge/amd/amdk8 # Northbridge / RAM controller device pci 18.0 on # Link 0 == LDT 0 chip southbridge/nvidia/mcp55 # Southbridge diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig index 96b456cec6..fd511a8a83 100644 --- a/src/mainboard/gigabyte/ma785gmt/Kconfig +++ b/src/mainboard/gigabyte/ma785gmt/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/gigabyte/ma785gmt/devicetree.cb b/src/mainboard/gigabyte/ma785gmt/devicetree.cb index dc7bd10a80..02e4bc888a 100644 --- a/src/mainboard/gigabyte/ma785gmt/devicetree.cb +++ b/src/mainboard/gigabyte/ma785gmt/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/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig index cf3f6a27ad..56b819ef62 100644 --- a/src/mainboard/gigabyte/ma78gm/Kconfig +++ b/src/mainboard/gigabyte/ma78gm/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/gigabyte/ma78gm/devicetree.cb b/src/mainboard/gigabyte/ma78gm/devicetree.cb index 59e1502dd7..38ff642c10 100644 --- a/src/mainboard/gigabyte/ma78gm/devicetree.cb +++ b/src/mainboard/gigabyte/ma78gm/devicetree.cb @@ -6,6 +6,7 @@ chip northbridge/amd/amdfam10/root_complex end end device pci_domain 0 on + subsystemid 0x3060 0x1022 inherit chip northbridge/amd/amdfam10 device pci 18.0 on # northbridge chip southbridge/amd/rs780 -- cgit v1.2.3