Make newconfig and kconfig agree on MAINBOARD_PCI_SUBSYSTEM_{VENDOR,DEVICE}_ID

Usually, this means adding values to Kconfig, but in a few cases, adding values
to newconfig, too (which doesn't hurt).

Also really hook up tyan/s2850 and tyan/s2875 to kconfig, and have them still
build.

Trivial and stupid kconfig changes, just lots of them.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4959 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

7 files changed, 74 insertions, 1 deletions

diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb
index bf30506261..975a085b1a 100644
--- a/src/mainboard/tyan/s1846/Options.lb
+++ b/src/mainboard/tyan/s1846/Options.lb
@@ -62,6 +62,7 @@ uses CONFIG_MAINBOARD_VENDOR
 uses CONFIG_MAINBOARD_PART_NUMBER
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_PCI_ROM_RUN
+uses CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_HAVE_FALLBACK_BOOT = 1
@@ -92,4 +93,5 @@ default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9
 default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9
 default CONFIG_CONSOLE_VGA = 1
 default CONFIG_PCI_ROM_RUN = 1
+default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x10f1
 end
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index df1a12fb81..8d516fe660 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -62,3 +62,9 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 	depends on BOARD_TYAN_S2735
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2735
+	depends on BOARD_TYAN_S2735
+
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 8c52218f76..090aa79e07 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -59,3 +59,29 @@ config IRQ_SLOT_COUNT
 	int
 	default 12
 	depends on BOARD_TYAN_S2850
+
+config HT_CHAIN_UNITID_BASE
+	hex
+	default 1
+	depends on BOARD_TYAN_S2850
+
+config HT_CHAIN_END_UNITID_BASE
+	hex
+	default 0x20
+	depends on BOARD_TYAN_S2850
+
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	bool
+	default y
+	depends on BOARD_TYAN_S2850
+
+config SB_HT_CHAIN_ON_BUS0
+	int
+	default 0
+	depends on BOARD_TYAN_S2850
+
+config APIC_ID_OFFSET
+	hex
+	default 0x0
+	depends on BOARD_TYAN_S2850
+
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 94b2b5a0af..a30df0a278 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -10,6 +10,7 @@ config BOARD_TYAN_S2875
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_512
+	select IOAPIC
 
 config MAINBOARD_DIR
 	string
@@ -65,3 +66,29 @@ config IRQ_SLOT_COUNT
 	int
 	default 13
 	depends on BOARD_TYAN_S2875
+
+config HT_CHAIN_UNITID_BASE
+	hex
+        default 1
+        depends on BOARD_TYAN_S2875
+
+config HT_CHAIN_END_UNITID_BASE
+	hex
+        default 0x20
+        depends on BOARD_TYAN_S2875
+
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+        bool
+        default y
+        depends on BOARD_TYAN_S2875
+
+config SB_HT_CHAIN_ON_BUS0
+        int
+        default 0
+        depends on BOARD_TYAN_S2875
+
+config APIC_ID_OFFSET
+	hex
+        default 0x0
+        depends on BOARD_TYAN_S2875
+
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 14e5c7aa99..4327abe559 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -139,7 +139,7 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-	default 0x2b80
+	default 0x2912
 	depends on BOARD_TYAN_S2912
 
 config IRQ_SLOT_COUNT
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index b03fab92f4..f063d9cb1c 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -104,3 +104,9 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_TYAN_S4880
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x4880
+	depends on BOARD_TYAN_S4880
+
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index ac32d8ce5f..d9b7886846 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -104,3 +104,9 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_TYAN_S4882
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x4882
+	depends on BOARD_TYAN_S4882
+