summaryrefslogtreecommitdiff
path: root/src/mainboard/supermicro
diff options
context:
space:
mode:
authorSven Schnelle <svens@stackframe.org>2011-03-01 19:58:47 +0000
committerSven Schnelle <svens@stackframe.org>2011-03-01 19:58:47 +0000
commit91321028ec3fac017e8e2c47ec5fe7742409b3b0 (patch)
tree738f9e0d9f124ef4670c5e21516695fc63fc6d46 /src/mainboard/supermicro
parent270a908646273461b41e591739d778d3d675ff6f (diff)
downloadcoreboot-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/supermicro')
-rw-r--r--src/mainboard/supermicro/Kconfig4
-rw-r--r--src/mainboard/supermicro/h8dme/Kconfig8
-rw-r--r--src/mainboard/supermicro/h8dme/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/h8dmr/Kconfig8
-rw-r--r--src/mainboard/supermicro/h8dmr/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/Kconfig4
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/Kconfig4
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/x6dai_g/Kconfig8
-rw-r--r--src/mainboard/supermicro/x6dai_g/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Kconfig8
-rw-r--r--src/mainboard/supermicro/x6dhe_g/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Kconfig8
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Kconfig8
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/devicetree.cb1
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Kconfig8
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/devicetree.cb1
19 files changed, 9 insertions, 68 deletions
diff --git a/src/mainboard/supermicro/Kconfig b/src/mainboard/supermicro/Kconfig
index 5ac7ddac36..8e5694cf1b 100644
--- a/src/mainboard/supermicro/Kconfig
+++ b/src/mainboard/supermicro/Kconfig
@@ -38,8 +38,4 @@ config MAINBOARD_VENDOR
string
default "Supermicro"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
endif # VENDOR_SUPERMICRO
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 0259b4af0c..ce49a4781e 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -81,12 +81,4 @@ config IRQ_SLOT_COUNT
int
default 11
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x1511
-
endif # BOARD_SUPERMICRO_H8DME
diff --git a/src/mainboard/supermicro/h8dme/devicetree.cb b/src/mainboard/supermicro/h8dme/devicetree.cb
index df40dc34e4..73a43e8271 100644
--- a/src/mainboard/supermicro/h8dme/devicetree.cb
+++ b/src/mainboard/supermicro/h8dme/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
end
device pci_domain 0 on # PCI domain
+ subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 81517bed1f..5527319ce8 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -80,12 +80,4 @@ config IRQ_SLOT_COUNT
int
default 11
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x1511
-
endif # BOARD_SUPERMICRO_H8DMR
diff --git a/src/mainboard/supermicro/h8dmr/devicetree.cb b/src/mainboard/supermicro/h8dmr/devicetree.cb
index 1dfd32ac5c..6c96ac0dea 100644
--- a/src/mainboard/supermicro/h8dmr/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdk8/root_complex # Root complex
end
end
device pci_domain 0 on # PCI domain
+ subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdk8 # Northbridge / RAM controller
device pci 18.0 on end
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 4b31bf30a7..195bc5cf41 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -100,8 +100,4 @@ config SERIAL_CPU_INIT
bool
default n
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x1511
-
endif # BOARD_SUPERMICRO_H8DMR_FAM10
diff --git a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
index da82b17376..6c4443f902 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8dmr_fam10/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
end
end
device pci_domain 0 on # PCI domain
+ subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on end
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index bd0f550d17..1d4f8e76cc 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -99,10 +99,6 @@ config SERIAL_CPU_INIT
bool
default y
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x1511
-
config STACK_SIZE
hex
default 0x10000
diff --git a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
index 990afa4c64..56ba7b5395 100644
--- a/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
+++ b/src/mainboard/supermicro/h8qme_fam10/devicetree.cb
@@ -5,6 +5,7 @@ chip northbridge/amd/amdfam10/root_complex # Root complex
end
end
device pci_domain 0 on # PCI domain
+ subsystemid 0x15d9 0x1511 inherit
chip northbridge/amd/amdfam10 # Northbridge / RAM controller
device pci 18.0 on end
device pci 18.0 on end
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index 8b1cf5a274..bac1008a1a 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -23,14 +23,6 @@ config MAINBOARD_PART_NUMBER
string
default "X6DAi-G"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x6780
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb
index c8ce779ca2..e6201a811e 100644
--- a/src/mainboard/supermicro/x6dai_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb
@@ -1,5 +1,6 @@
chip northbridge/intel/e7525 # mch
device pci_domain 0 on
+ subsystemid 0x15d9 0x6780 inherit
chip southbridge/intel/esb6300 # esb6300
register "pirq_a_d" = "0x0b0a0a05"
register "pirq_e_h" = "0x0a0b0c80"
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 8771d9ec58..e8466be8a3 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER
string
default "X6DHE-G"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x6080
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/supermicro/x6dhe_g/devicetree.cb b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
index 6dd6b17d66..08c0751c00 100644
--- a/src/mainboard/supermicro/x6dhe_g/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g/devicetree.cb
@@ -6,6 +6,7 @@ chip northbridge/intel/e7520 # MCH
device pnp 00.3 off end
end
device pci_domain 0 on
+ subsystemid 0x15d9 0x6080 inherit
chip southbridge/intel/esb6300 # ESB6300
register "pirq_a_d" = "0x0b070a05"
register "pirq_e_h" = "0x0a808080"
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index 96549d6154..e9d404191e 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -26,14 +26,6 @@ config MAINBOARD_PART_NUMBER
string
default "X6DHE-G2"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x6080
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
index 04110b0eb7..ecfe0a00a3 100644
--- a/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhe_g2/devicetree.cb
@@ -6,6 +6,7 @@ chip northbridge/intel/e7520 # MCH
device pnp 00.3 off end
end
device pci_domain 0 on
+ subsystemid 0x15d9 0x6080 inherit
chip southbridge/intel/i82801ex # ICH5R
register "pirq_a_d" = "0x0b070a05"
register "pirq_e_h" = "0x0a808080"
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index d1163d74b7..a146e77a6c 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER
string
default "X6DHR-iG"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x5580
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
index df778ed61b..6ada3b1341 100644
--- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb
@@ -1,5 +1,6 @@
chip northbridge/intel/e7520 # mch
device pci_domain 0 on
+ subsystemid 0x15d9 0x5580 inherit
chip southbridge/intel/i82801ex # i82801er
# USB ports
device pci 1d.0 on end
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index 494b0ed43c..6196e2ab71 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -25,14 +25,6 @@ config MAINBOARD_PART_NUMBER
string
default "X6DHR-iG2"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x15d9
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0x5580
-
config MAX_CPUS
int
default 4
diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
index 77c9e9d7cb..3d9b644fd9 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
+++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb
@@ -1,5 +1,6 @@
chip northbridge/intel/e7520 # mch
device pci_domain 0 on
+ subsystemid 0x15d9 0x5580 inherit
chip southbridge/intel/i82801ex # i82801er
# USB ports
device pci 1d.0 on end