summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-05-15 12:36:57 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2012-05-26 07:16:00 +0200
commit56c7dc797246bf4e82879de23436783bbbe54b77 (patch)
treefd20140428d918a8e1b43a46c0365f3d2b39810b
parent5649b08e20413f21308951b72c583e926fe2d1f1 (diff)
Move subsystem IDs to devicetree.cb
A while back coreboot was changed to read the subsystem IDs from devicetree.cb to allow each onboard PCI device to have its own subsystem id. When we originally branched, this was not the case, and the sandybridge/ivybridge mainboards have not been updated yet. Also, drop the subsystem ID from Emerald Lake 2, since it's not a Google device. Change-Id: Ie96fd67cd2ff65ad6ff725914e3bad843e78712e Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1042 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/mainboard/intel/emeraldlake2/Kconfig8
-rw-r--r--src/mainboard/samsung/lumpy/Kconfig8
-rw-r--r--src/mainboard/samsung/lumpy/devicetree.cb1
-rw-r--r--src/mainboard/samsung/stumpy/Kconfig8
-rw-r--r--src/mainboard/samsung/stumpy/devicetree.cb1
5 files changed, 2 insertions, 24 deletions
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 9e4f34746d..873d273e1f 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -43,12 +43,4 @@ config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x1ae0
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0xc000
-
endif # BOARD_INTEL_EMERALDLAKE2
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 200edac3a5..0835012a63 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -44,14 +44,6 @@ config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x1ae0
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0xc000
-
config MAINBOARD_POWER_ON_AFTER_POWER_FAIL
bool
default n
diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb
index 36af1cae32..3e93df4a57 100644
--- a/src/mainboard/samsung/lumpy/devicetree.cb
+++ b/src/mainboard/samsung/lumpy/devicetree.cb
@@ -33,6 +33,7 @@ chip northbridge/intel/sandybridge
end
device pci_domain 0 on
+ subsystemid 0x1ae0 0xc000 inherit
device pci 00.0 on end # host bridge
device pci 02.0 on end # vga controller
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index dda300264e..18094cff03 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -43,14 +43,6 @@ config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
- hex
- default 0x1ae0
-
-config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
- hex
- default 0xc000
-
config MAINBOARD_POWER_ON_AFTER_POWER_FAIL
bool
default n
diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb
index f10b283626..b59dcb2529 100644
--- a/src/mainboard/samsung/stumpy/devicetree.cb
+++ b/src/mainboard/samsung/stumpy/devicetree.cb
@@ -28,6 +28,7 @@ chip northbridge/intel/sandybridge
end
device pci_domain 0 on
+ subsystemid 0x1ae0 0xc000 inherit
device pci 00.0 on end # host bridge
device pci 02.0 on end # vga controller