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

diff --git a/src/mainboard/Makefile.k8_CAR.inc b/src/mainboard/Makefile.k8_CAR.inc
index c154175294f71ec27eae91556dd8d7aa979050f7..60b7dfb7c3e56d51d8da0b258eed4bed3fdab7c9 100644 (file)
--- 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 08482d5e08b0e21d612e8d53f43b1cf5cdccc3ca..e412f8e3fb12c7fcd877ab53783bf1b0961bd497 100644 (file)
--- 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 5a2fa333c940199e42cdc1530c45e94697a25cc5..70df54a718c64053e02d5bb44194c050d5cc6fe1 100644 (file)
--- 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 8d649bc0b17a02a43f65527b071444950dfc4d31..5c7ee6e6db702deeae25df8fb4249c477b73ec4e 100644 (file)
--- 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
@@ -54,11 +53,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
 ##

diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index 98d7282542efabc7796ce2ec12d21ebf48fe25fc..e319d98d2f404c5ac638e6823635ae36be0f589c 100644 (file)
--- 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 38ee2af977709e476eca05eec8303c45f0a404ee..e4ac9d40760b80ec279b5153b331d8fc2d934856 100644 (file)
--- 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 dda9df78b66055e6592c1c5b683f4f6cd838b7ef..70fc760e83e81e39295ec6a3d265606d0fc67494 100644 (file)
--- 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 53cb4fcdcf08b2a8506ef22279e28dbfb98f65aa..b1077f994081af535e1d5af01cf35978048393ca 100644 (file)
--- 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 53cb4fcdcf08b2a8506ef22279e28dbfb98f65aa..b1077f994081af535e1d5af01cf35978048393ca 100644 (file)
--- 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 53cb4fcdcf08b2a8506ef22279e28dbfb98f65aa..b1077f994081af535e1d5af01cf35978048393ca 100644 (file)
--- 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 17a7d7f0dc897e15ac2b0e6265e5f6914d0775c1..c977ed3387a0213ec7bae7d5eaf64a8142585b86 100644 (file)
--- 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 53cb4fcdcf08b2a8506ef22279e28dbfb98f65aa..b1077f994081af535e1d5af01cf35978048393ca 100644 (file)
--- 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 53cb4fcdcf08b2a8506ef22279e28dbfb98f65aa..c9f716360b607a887c3b65e1ab81990a1fb89327 100644 (file)
--- 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