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

src/mainboard/amd/dbm690t/Kconfig

@@ -102,3 +102,13 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_AMD_DBM690T
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends on BOARD_AMD_DBM690T
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x3050
+	depends on BOARD_AMD_DBM690T

src/mainboard/amd/pistachio/Kconfig

@@ -101,3 +101,13 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_AMD_PISTACHIO
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends on BOARD_AMD_PISTACHIO
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x3050
+	depends on BOARD_AMD_PISTACHIO

src/mainboard/amd/serengeti_cheetah/Kconfig

@@ -114,3 +114,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_AMD_SERENGETI_CHEETAH
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+        default 0x1022
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+        default 0x2b80
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+

src/mainboard/asus/a8n_e/Kconfig

@@ -103,3 +103,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 13
 	depends on BOARD_ASUS_A8N_E
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1043
+	depends on BOARD_ASUS_A8N_E
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x815a
+	depends on BOARD_ASUS_A8N_E
+

src/mainboard/asus/a8v-e_se/Kconfig

@@ -103,3 +103,9 @@ config IRQ_SLOT_COUNT
 	int
 	default 13
 	depends on BOARD_ASUS_A8V_E_SE
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1043
+	depends on BOARD_ASUS_A8V_E_SE
+

src/mainboard/asus/m2v-mx_se/Kconfig

@@ -111,3 +111,8 @@ config HT_CHAIN_END_UNITID_BASE
 	default 0x20
 	depends on BOARD_ASUS_M2V_MX_SE
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1043
+	depends on BOARD_ASUS_M2V_MX_SE
+

src/mainboard/broadcom/blast/Kconfig

@@ -104,3 +104,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_BROADCOM_BLAST
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x161f
+	depends on BOARD_BROADCOM_BLAST
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x3050
+	depends on BOARD_BROADCOM_BLAST
+

src/mainboard/dell/s1850/Kconfig

@@ -9,6 +9,7 @@ config BOARD_DELL_S1850
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select BOARD_ROMSIZE_KB_1024
+	select UDELAY_TSC
 
 config MAINBOARD_DIR
 	string
@@ -32,12 +33,12 @@ config MAINBOARD_PART_NUMBER
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-	default 0x016c
+	default 0x5580
 	depends on BOARD_DELL_S1850
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
-	default 0x1028
+	default 0x15d9
 	depends on BOARD_DELL_S1850
 
 

src/mainboard/gigabyte/ga_2761gxdk/Kconfig

@@ -133,12 +133,12 @@ config WAIT_BEFORE_CPUS_INIT
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
-	default 0x1022
+	default 0x1039
 	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-	default 0x2b80
+	default 0x1234
 	depends on BOARD_GIGABYTE_GA_2761GXDK
 
 config IRQ_SLOT_COUNT

src/mainboard/intel/jarrell/Kconfig

@@ -43,3 +43,13 @@ config IRQ_SLOT_COUNT
 	default 9
 	depends on BOARD_INTEL_JARRELL
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x8086
+	depends on BOARD_INTEL_JARRELL
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x1079
+	depends on BOARD_INTEL_JARRELL
+

src/mainboard/intel/mtarvon/Kconfig

@@ -39,3 +39,13 @@ config IRQ_SLOT_COUNT
 	int
 	default 1
 	depends on BOARD_INTEL_MTARVON
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x8086
+	depends on BOARD_INTEL_MTARVON
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2680
+	depends on BOARD_INTEL_MTARVON

src/mainboard/intel/truxton/Kconfig

@@ -41,3 +41,13 @@ config IRQ_SLOT_COUNT
 	default 1
 	depends on BOARD_INTEL_TRUXTON
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x8086
+	depends on BOARD_INTEL_TRUXTON
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2680
+	depends on BOARD_INTEL_TRUXTON
+

src/mainboard/intel/xe7501devkit/Kconfig

@@ -52,3 +52,14 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 	depends on BOARD_INTEL_XE7501DEVKIT
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x8086
+	depends on BOARD_INTEL_XE7501DEVKIT
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2480
+	depends on BOARD_INTEL_XE7501DEVKIT
+

src/mainboard/iwill/dk8_htx/Kconfig

@@ -108,3 +108,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_IWILL_DK8_HTX
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends on BOARD_IWILL_DK8_HTX
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2b80
+	depends on BOARD_IWILL_DK8_HTX
+

src/mainboard/iwill/dk8s2/Kconfig

@@ -107,3 +107,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_IWILL_DK8S2
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x161f
+	depends on BOARD_IWILL_DK8S2
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x3016
+	depends on BOARD_IWILL_DK8S2
+

src/mainboard/msi/ms9185/Kconfig

@@ -105,3 +105,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_MSI_MS9185
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends on BOARD_MSI_MS9185
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x2b80
+	depends on BOARD_MSI_MS9185
+

src/mainboard/newisys/khepri/Kconfig

@@ -104,3 +104,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_NEWISYS_KHEPRI
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x17c2
+	depends on BOARD_NEWISYS_KHEPRI
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x10
+	depends on BOARD_NEWISYS_KHEPRI
+

src/mainboard/sunw/ultra40/Kconfig

@@ -103,3 +103,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_SUNW_ULTRA40
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x108e
+	depends on BOARD_SUNW_ULTRA40
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x40
+	depends on BOARD_SUNW_ULTRA40
+

src/mainboard/supermicro/h8dme/Kconfig

@@ -110,3 +110,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_SUPERMICRO_H8DME
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x15d9
+	depends on BOARD_SUPERMICRO_H8DME
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x1511
+	depends on BOARD_SUPERMICRO_H8DME
+

src/mainboard/supermicro/h8dmr/Kconfig

@@ -109,3 +109,14 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_SUPERMICRO_H8DMR
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x15d9
+	depends on BOARD_SUPERMICRO_H8DMR
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x1511
+	depends on BOARD_SUPERMICRO_H8DMR
+

src/mainboard/supermicro/x6dhr_ig/Kconfig

@@ -37,7 +37,7 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-	default 0x6780
+	default 0x5580
 	depends on BOARD_SUPERMICRO_X6DHR_IG
 
 config MAX_CPUS

src/mainboard/supermicro/x6dhr_ig2/Kconfig

@@ -37,7 +37,7 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
 	hex
-	default 0x6780
+	default 0x5580
 	depends on BOARD_SUPERMICRO_X6DHR_IG2
 
 config MAX_CPUS

src/mainboard/technexion/tim8690/Kconfig

@@ -102,3 +102,13 @@ config IRQ_SLOT_COUNT
 	int
 	default 11
 	depends on BOARD_TECHNEXION_TIM8690
+
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+	hex
+	default 0x1022
+	depends on BOARD_TECHNEXION_TIM8690
+
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+	hex
+	default 0x3050
+	depends on BOARD_TECHNEXION_TIM8690

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

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
+

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
+

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
+

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

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
+

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
+

src/mainboard/via/epia-cn/Options.lb

@@ -64,7 +64,9 @@ uses CONFIG_CONSOLE_VGA
 uses CONFIG_TTYS0_BAUD
 uses CONFIG_VIDEO_MB
 uses CONFIG_IOAPIC
+uses CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
+default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1019
 default CONFIG_ROM_SIZE = 512 * 1024
 default CONFIG_IOAPIC = 0
 default CONFIG_VIDEO_MB = 32

src/mainboard/via/epia-m/Options.lb

@@ -42,6 +42,9 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
 uses CONFIG_PCI_ROM_RUN
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_TTYS0_BAUD
+uses CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+
+default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1019
 
 ## CONFIG_ROM_SIZE is the size of boot ROM that this board will use.
 default CONFIG_ROM_SIZE  = 256*1024

src/mainboard/via/epia-n/Options.lb

@@ -70,7 +70,9 @@ uses CONFIG_IOAPIC
 uses CONFIG_COMPRESS
 uses CONFIG_EPIA_VT8237R_INIT
 uses CONFIG_HAVE_MAINBOARD_RESOURCES
+uses CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
+default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1019
 default CONFIG_EPIA_VT8237R_INIT = 1
 #default CONFIG_RAMTOP = 4 * 1024*1024
 default CONFIG_ROM_SIZE = 512 * 1024

src/mainboard/via/epia/Options.lb

@@ -49,6 +49,10 @@ uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_MAXIMUM_CONSOLE_LOGLEVEL
 
+uses CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+
+default CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID = 0x1019
+
 default CONFIG_CONSOLE_SERIAL8250=1
 ## Select the serial console baud rate
 default CONFIG_TTYS0_BAUD=115200