Author: myles
Date: 2009-12-02 22:11:12 +0100 (Wed, 02 Dec 2009)
New Revision: 4974

Modified:
   trunk/src/mainboard/Kconfig
   trunk/src/mainboard/intel/d945gclf/Kconfig
   trunk/src/mainboard/msi/ms7135/Kconfig
   trunk/src/mainboard/supermicro/x6dhe_g/Kconfig
   trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc
   trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig
   trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
   trunk/src/mainboard/technologic/ts5300/Kconfig
   trunk/src/mainboard/tyan/s2912/Kconfig
   trunk/src/mainboard/tyan/s2912_fam10/Kconfig
   trunk/src/mainboard/via/epia-m700/Makefile.inc
   trunk/src/mainboard/via/vt8454c/Makefile.inc
Log:
Trivial fixes for kconfig.  They fix all non-fam10 build failures.

Signed-off-by: Myles Watson <[email protected]>
Acked-by: Myles Watson <[email protected]>


Modified: trunk/src/mainboard/Kconfig
===================================================================
--- trunk/src/mainboard/Kconfig 2009-12-02 05:43:50 UTC (rev 4973)
+++ trunk/src/mainboard/Kconfig 2009-12-02 21:11:12 UTC (rev 4974)
@@ -210,6 +210,11 @@
        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 @@
        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"

Modified: trunk/src/mainboard/intel/d945gclf/Kconfig
===================================================================
--- trunk/src/mainboard/intel/d945gclf/Kconfig  2009-12-02 05:43:50 UTC (rev 
4973)
+++ trunk/src/mainboard/intel/d945gclf/Kconfig  2009-12-02 21:11:12 UTC (rev 
4974)
@@ -65,6 +65,11 @@
        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

Modified: trunk/src/mainboard/msi/ms7135/Kconfig
===================================================================
--- trunk/src/mainboard/msi/ms7135/Kconfig      2009-12-02 05:43:50 UTC (rev 
4973)
+++ trunk/src/mainboard/msi/ms7135/Kconfig      2009-12-02 21:11:12 UTC (rev 
4974)
@@ -24,7 +24,7 @@
 
 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_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x2895
+       default 0x7135
        depends on BOARD_MSI_MS7135
 
 config HW_MEM_HOLE_SIZEK

Modified: trunk/src/mainboard/supermicro/x6dhe_g/Kconfig
===================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g/Kconfig      2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/supermicro/x6dhe_g/Kconfig      2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -38,7 +38,7 @@
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x6780
+       default 0x6080
        depends on BOARD_SUPERMICRO_X6DHE_G
 
 config MAX_CPUS

Modified: trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc
===================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc 2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/supermicro/x6dhe_g/Makefile.inc 2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -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
 

Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig
===================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig     2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig     2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -38,7 +38,7 @@
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0x6780
+       default 0x6080
        depends on BOARD_SUPERMICRO_X6DHE_G2
 
 config MAX_CPUS

Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc
===================================================================
--- trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc        2009-12-02 
05:43:50 UTC (rev 4973)
+++ trunk/src/mainboard/supermicro/x6dhe_g2/Makefile.inc        2009-12-02 
21:11:12 UTC (rev 4974)
@@ -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
 

Modified: trunk/src/mainboard/technologic/ts5300/Kconfig
===================================================================
--- trunk/src/mainboard/technologic/ts5300/Kconfig      2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/technologic/ts5300/Kconfig      2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -20,3 +20,7 @@
        default 2
        depends on BOARD_TECHNOLOGIC_TS5300
 
+config HAVE_INIT_TIMER
+       bool
+       default n
+       depends on BOARD_TECHNOLOGIC_TS5300

Modified: trunk/src/mainboard/tyan/s2912/Kconfig
===================================================================
--- trunk/src/mainboard/tyan/s2912/Kconfig      2009-12-02 05:43:50 UTC (rev 
4973)
+++ trunk/src/mainboard/tyan/s2912/Kconfig      2009-12-02 21:11:12 UTC (rev 
4974)
@@ -132,11 +132,6 @@
        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

Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig
===================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Kconfig        2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig        2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -133,11 +133,6 @@
        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

Modified: trunk/src/mainboard/via/epia-m700/Makefile.inc
===================================================================
--- trunk/src/mainboard/via/epia-m700/Makefile.inc      2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/via/epia-m700/Makefile.inc      2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -46,13 +46,9 @@
 
 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 $@

Modified: trunk/src/mainboard/via/vt8454c/Makefile.inc
===================================================================
--- trunk/src/mainboard/via/vt8454c/Makefile.inc        2009-12-02 05:43:50 UTC 
(rev 4973)
+++ trunk/src/mainboard/via/vt8454c/Makefile.inc        2009-12-02 21:11:12 UTC 
(rev 4974)
@@ -42,11 +42,11 @@
 
 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


-- 
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to