summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-12-02 21:11:12 +0000
committerMyles Watson <mylesgw@gmail.com>2009-12-02 21:11:12 +0000
commit1a76ebe2a20f2a30dfebd77ffea8d3daf6807505 (patch)
treed64ec3d74715181ee22201b1d456b25f1330f823 /src
parent59968f5c81a83ba3a45c9ce26e28ecaa7621b87b (diff)
downloadcoreboot-1a76ebe2a20f2a30dfebd77ffea8d3daf6807505.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/Kconfig10
-rw-r--r--src/mainboard/intel/d945gclf/Kconfig5
-rw-r--r--src/mainboard/msi/ms7135/Kconfig4
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Makefile.inc1
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Kconfig2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Makefile.inc1
-rw-r--r--src/mainboard/technologic/ts5300/Kconfig4
-rw-r--r--src/mainboard/tyan/s2912/Kconfig5
-rw-r--r--src/mainboard/tyan/s2912_fam10/Kconfig5
-rw-r--r--src/mainboard/via/epia-m700/Makefile.inc6
-rw-r--r--src/mainboard/via/vt8454c/Makefile.inc6
12 files changed, 29 insertions, 22 deletions
diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index d10936af34..54198e1364 100644
--- 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 633b9cec03..d9fc652af5 100644
--- 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 f9410fd784..2582d0d29a 100644
--- 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 952f0004dc..d390f678a0 100644
--- 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 455da185cf..3f08355d04 100644
--- 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 44d3e78aa8..df326d334e 100644
--- 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 455da185cf..3f08355d04 100644
--- 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 f813e4e952..982e174d28 100644
--- 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 4327abe559..bcd01c0397 100644
--- 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 fc6327306a..2363a2131f 100644
--- 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 e0528f6925..0fb626bc40 100644
--- 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 318d81fe0b..fad1a09791 100644
--- 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