Trivial fixes for kconfig. They fix all non-fam10 build failures.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4974 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index d10936af3472d907455d9241c9c7db9e613e8d59..54198e13643a392041af5bc3cbd2aa267de57aa7 100644 (file)
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -210,6 +210,11 @@ config MAINBOARD_VENDOR
        default "Intel"
        depends on VENDOR_INTEL
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+       hex
+       default 0x8086
+       depends on VENDOR_INTEL
+
 config MAINBOARD_VENDOR
        string
        default "IWILL"
@@ -240,6 +245,11 @@ config MAINBOARD_VENDOR
        default "MSI"
        depends on VENDOR_MSI
 
+config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
+       hex
+       default 0x1462
+       depends on VENDOR_MSI
+
 config MAINBOARD_VENDOR
        string
        default "NEC"

diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 633b9cec035bd5450c0f9301fc63183e3caa5f7f..d9fc652af5eca7d2f24667eccd0e326f528e6209 100644 (file)
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -65,6 +65,11 @@ config MAINBOARD_PART_NUMBER
        default "D945GCLF"
        depends on BOARD_INTEL_D945GCLF
 
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+       hex
+       default 0x464C
+       depends on BOARD_INTEL_D945GCLF
+
 config MMCONF_BASE_ADDRESS
        hex
        default 0xf0000000

diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index f9410fd7841dbafb3d5321dcdab398cafba10816..2582d0d29a1c6b45564b272add2453dc1671bc03 100644 (file)
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -24,7 +24,7 @@ config APIC_ID_OFFSET
 
 config MEM_TRAIN_SEQ
        int
-       default 1
+       default 0
        depends on BOARD_MSI_MS7135
 
 config SB_HT_CHAIN_ON_BUS0
@@ -49,7 +49,7 @@ config MAINBOARD_PART_NUMBER
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x2895
+       default 0x7135
        depends on BOARD_MSI_MS7135
 
 config HW_MEM_HOLE_SIZEK

diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 952f0004dcf1710481d6bee57556c42a554a4972..d390f678a0016f11630768946f7a487de23ae6c3 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -38,7 +38,7 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x6780
+       default 0x6080
        depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAX_CPUS

diff --git a/src/mainboard/supermicro/x6dhe_g/Makefile.inc b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
index 455da185cf34d70d99477b90aadd599d46223ae0..3f08355d047b91fe224b80007411fa75d81f57a6 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g/Makefile.inc
@@ -21,4 +21,5 @@
 ROMCCFLAGS=-mcpu=p4 -O2
 obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 include $(src)/mainboard/Makefile.romccboard.inc
+driver-y += ../../../drivers/generic/debug/debug_dev.o
 

diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index 44d3e78aa8107ba52e79d8a8fafc9c211f6ad67c..df326d334e9e32c15f7eb07b28636e83cc20325b 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -38,7 +38,7 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x6780
+       default 0x6080
        depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAX_CPUS

diff --git a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
index 455da185cf34d70d99477b90aadd599d46223ae0..3f08355d047b91fe224b80007411fa75d81f57a6 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
+++ b/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
@@ -21,4 +21,5 @@
 ROMCCFLAGS=-mcpu=p4 -O2
 obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
 include $(src)/mainboard/Makefile.romccboard.inc
+driver-y += ../../../drivers/generic/debug/debug_dev.o
 

diff --git a/src/mainboard/technologic/ts5300/Kconfig b/src/mainboard/technologic/ts5300/Kconfig
index f813e4e9521a64b7c410f025d4dfa5a0b116f05a..982e174d2897e36b967c4462f4e44c09c7aec5ce 100644 (file)
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -20,3 +20,7 @@ config IRQ_SLOT_COUNT
        default 2
        depends on BOARD_TECHNOLOGIC_TS5300
 
+config HAVE_INIT_TIMER
+       bool
+       default n
+       depends on BOARD_TECHNOLOGIC_TS5300

diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 4327abe559cfa5c4ce35674e07eeb250e462d1fa..bcd01c03973c554e98d0ab02791414e643c06f60 100644 (file)
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -132,11 +132,6 @@ config WAIT_BEFORE_CPUS_INIT
        default n
        depends on BOARD_TYAN_S2912
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x1022
-       depends on BOARD_TYAN_S2912
-
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
        default 0x2912

diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index fc6327306a59e8dafc260fa1c72643552f7788c6..2363a2131fc52a1905de788cfb1dd97899a37b15 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -133,11 +133,6 @@ config WAIT_BEFORE_CPUS_INIT
        default n
        depends on BOARD_TYAN_S2912_FAM10
 
-config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
-       hex
-       default 0x10f1
-       depends on BOARD_TYAN_S2912_FAM10
-
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
        default 0x2912

diff --git a/src/mainboard/via/epia-m700/Makefile.inc b/src/mainboard/via/epia-m700/Makefile.inc
index e0528f69257b099b282d1629610a1b571f2a3778..0fb626bc40942f0c5e14bbb291884bc1da706588 100644 (file)
--- a/src/mainboard/via/epia-m700/Makefile.inc
+++ b/src/mainboard/via/epia-m700/Makefile.inc
@@ -46,13 +46,9 @@ crt0-y += cache_as_ram_auto.inc
 
 ifdef POST_EVALUATION
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.c
        $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-       iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-       mv dsdt.hex $@
-
 $(obj)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
        $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@
        perl -e 's/\.rodata/.rom.data/g' -pi $@

diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index 318d81fe0b7eea10d05b5cc89a71f3d453c01bac..fad1a09791ef1a04498d25f119826e66fda76ae2 100644 (file)
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -42,11 +42,11 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
-       iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+       iasl -p dsdt -tc $<
        mv dsdt.hex $@
 
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
        $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
 
 $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h