Fix some builds with Kconfig.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


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

13 files changed, 28 insertions, 22 deletions

diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index c154175294..60b7dfb7c3 100644
--- a/src/mainboard/Makefile.k8_CAR.inc
+++ b/src/mainboard/Makefile.k8_CAR.inc
@@ -49,11 +49,11 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv dsdt.hex $@
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	mv $(obj)/mainboard/$(MAINBOARDDIR)/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)/cache_as_ram_auto.c $(obj)/option_table.h
diff --git a/src/mainboard/Makefile.k8_ck804.inc b/src/mainboard/Makefile.k8_ck804.inc
index 08482d5e08..e412f8e3fb 100644
--- a/src/mainboard/Makefile.k8_ck804.inc
+++ b/src/mainboard/Makefile.k8_ck804.inc
@@ -53,11 +53,11 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
-	mv dsdt.hex $@
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	mv $(obj)/mainboard/$(MAINBOARDDIR)/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)/cache_as_ram_auto.c $(obj)/option_table.h
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index 5a2fa333c9..70df54a718 100644
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig
@@ -8,7 +8,6 @@ config BOARD_DIGITALLOGIC_ADL855PC
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	select BOARD_ROMSIZE_KB_1024
-	select HAVE_HARD_RESET
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 8d649bc0b1..5c7ee6e6db 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -2,7 +2,6 @@ uses CONFIG_GENERATE_MP_TABLE
 uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_USE_FALLBACK_IMAGE
 uses CONFIG_HAVE_FALLBACK_BOOT
-uses CONFIG_HAVE_HARD_RESET
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_USE_OPTION_TABLE
 uses CONFIG_ROM_PAYLOAD
@@ -55,11 +54,6 @@ default CONFIG_HAVE_FALLBACK_BOOT=1
 default CONFIG_GENERATE_MP_TABLE=0
 
 ##
-## Build code to reset the motherboard from coreboot
-##
-default CONFIG_HAVE_HARD_RESET=1
-
-##
 ## use io based udelay function
 ##
 default CONFIG_UDELAY_IO=1
diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index 98d7282542..e319d98d2f 100644
--- a/src/mainboard/emulation/qemu-x86/Kconfig
+++ b/src/mainboard/emulation/qemu-x86/Kconfig
@@ -20,3 +20,8 @@ config IRQ_SLOT_COUNT
 	int
 	default 6
 	depends on BOARD_EMULATION_QEMU_X86
+
+config HAVE_INIT_TIMER
+	bool
+	default n
+	depends on BOARD_EMULATION_QEMU_X86
diff --git a/src/mainboard/intel/eagleheights/Makefile.inc b/src/mainboard/intel/eagleheights/Makefile.inc
index 38ee2af977..e4ac9d4076 100644
--- a/src/mainboard/intel/eagleheights/Makefile.inc
+++ b/src/mainboard/intel/eagleheights/Makefile.inc
@@ -26,6 +26,13 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
 
 ifdef POST_EVALUATION
 
+$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
+	mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
+
+$(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
 	$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S  $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
 	perl -e 's/\.rodata/.rom.data/g' -pi $@
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index dda9df78b6..70fc760e83 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -12,7 +12,6 @@ config BOARD_MSI_MS9185
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
-	select HAVE_ACPI_TABLES
 	select IOAPIC
 	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
diff --git a/src/mainboard/tyan/s2850/Makefile.inc b/src/mainboard/tyan/s2850/Makefile.inc
index 53cb4fcdcf..b1077f9940 100644
--- a/src/mainboard/tyan/s2850/Makefile.inc
+++ b/src/mainboard/tyan/s2850/Makefile.inc
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
diff --git a/src/mainboard/tyan/s2875/Makefile.inc b/src/mainboard/tyan/s2875/Makefile.inc
index 53cb4fcdcf..b1077f9940 100644
--- a/src/mainboard/tyan/s2875/Makefile.inc
+++ b/src/mainboard/tyan/s2875/Makefile.inc
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
diff --git a/src/mainboard/tyan/s2880/Makefile.inc b/src/mainboard/tyan/s2880/Makefile.inc
index 53cb4fcdcf..b1077f9940 100644
--- a/src/mainboard/tyan/s2880/Makefile.inc
+++ b/src/mainboard/tyan/s2880/Makefile.inc
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
diff --git a/src/mainboard/tyan/s2881/Makefile.inc b/src/mainboard/tyan/s2881/Makefile.inc
index 17a7d7f0dc..c977ed3387 100644
--- a/src/mainboard/tyan/s2881/Makefile.inc
+++ b/src/mainboard/tyan/s2881/Makefile.inc
@@ -1,2 +1,3 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
+obj-y += get_bus_conf.o
 driver-y += ../../../drivers/i2c/adm1027/adm1027.o
diff --git a/src/mainboard/tyan/s2882/Makefile.inc b/src/mainboard/tyan/s2882/Makefile.inc
index 53cb4fcdcf..b1077f9940 100644
--- a/src/mainboard/tyan/s2882/Makefile.inc
+++ b/src/mainboard/tyan/s2882/Makefile.inc
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
diff --git a/src/mainboard/tyan/s2885/Makefile.inc b/src/mainboard/tyan/s2885/Makefile.inc
index 53cb4fcdcf..c9f716360b 100644
--- a/src/mainboard/tyan/s2885/Makefile.inc
+++ b/src/mainboard/tyan/s2885/Makefile.inc
@@ -1 +1,2 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
+obj-y += get_bus_conf.o