[v2] r4883 - in trunk/coreboot-v2/src/mainboard: . digitallogic/adl855pc emulation/qemu-x86 intel/eagleheights msi/ms9185 tyan/s2850 tyan/s2875 tyan/s2880 tyan/s2881 tyan/s2882 tyan/s2885

Author: myles
Date: 2009-10-28 19:57:06 +0100 (Wed, 28 Oct 2009)
New Revision: 4883

Modified:
   trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc
   trunk/coreboot-v2/src/mainboard/Makefile.k8_ck804.inc
   trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig
   trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
   trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
   trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc
   trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc
Log:
Fix some builds with Kconfig.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -49,11 +49,11 @@

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

Modified: trunk/coreboot-v2/src/mainboard/Makefile.k8_ck804.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/Makefile.k8_ck804.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/Makefile.k8_ck804.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -53,11 +53,11 @@

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

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Kconfig	2009-10-28 18:57:06 UTC (rev 4883)
@@ -8,7 +8,6 @@
    select HAVE_PIRQ_TABLE
    select UDELAY_TSC
    select BOARD_ROMSIZE_KB_1024
-	select HAVE_HARD_RESET

config MAINBOARD_DIR
    string

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-10-28 18:57:06 UTC (rev 4883)
@@ -2,7 +2,6 @@
 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_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

Modified: trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/emulation/qemu-x86/Kconfig	2009-10-28 18:57:06 UTC (rev 4883)
@@ -20,3 +20,8 @@
    int
    default 6
    depends on BOARD_EMULATION_QEMU_X86
+
+config HAVE_INIT_TIMER
+	bool
+	default n
+	depends on BOARD_EMULATION_QEMU_X86

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -26,6 +26,13 @@

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 $@

Modified: trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/msi/ms9185/Kconfig	2009-10-28 18:57:06 UTC (rev 4883)
@@ -12,7 +12,6 @@
    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

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2880/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -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

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2882/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -1 +1 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc	2009-10-28 18:51:47 UTC (rev 4882)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc	2009-10-28 18:57:06 UTC (rev 4883)
@@ -1 +1,2 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
+include $(src)/mainboard/Makefile.k8_CAR.inc
+obj-y += get_bus_conf.o