From e8d943f2668ab25d98ed61cd10d68353c4915f4b Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 25 Jan 2010 15:17:11 +0000 Subject: Fix ACPI build on a couple of boards (now that it's active) Fix timer handling on amd/sc520 systems Match UDELAY_* configuration of newconfig in Kconfig Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5054 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/sc520/Kconfig | 4 ++ src/cpu/intel/socket_PGA370/Kconfig | 1 + src/cpu/intel/socket_mPGA604/Kconfig | 1 + src/cpu/via/model_c3/Kconfig | 1 + src/mainboard/amd/serengeti_cheetah/Makefile.inc | 34 ++++++++-------- src/mainboard/digitallogic/adl855pc/Kconfig | 1 - src/mainboard/iei/juki-511p/Kconfig | 1 - src/mainboard/iei/pcisa-lx-800-r10/Kconfig | 1 - src/mainboard/iwill/dk8_htx/Makefile.inc | 50 ++++++++++++------------ src/mainboard/msi/ms6178/Kconfig | 1 - 10 files changed, 49 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/cpu/amd/sc520/Kconfig b/src/cpu/amd/sc520/Kconfig index 6d3fa19017..82d892573b 100644 --- a/src/cpu/amd/sc520/Kconfig +++ b/src/cpu/amd/sc520/Kconfig @@ -6,3 +6,7 @@ config UDELAY_IO default n depends on CPU_AMD_SC520 +config HAVE_INIT_TIMER + bool + default n + depends on CPU_AMD_SC520 diff --git a/src/cpu/intel/socket_PGA370/Kconfig b/src/cpu/intel/socket_PGA370/Kconfig index 307b81355e..cd3ecd0107 100644 --- a/src/cpu/intel/socket_PGA370/Kconfig +++ b/src/cpu/intel/socket_PGA370/Kconfig @@ -21,3 +21,4 @@ config CPU_INTEL_SOCKET_PGA370 bool select MMX + select UDELAY_TSC diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig index 130d4b8c54..2668174e71 100644 --- a/src/cpu/intel/socket_mPGA604/Kconfig +++ b/src/cpu/intel/socket_mPGA604/Kconfig @@ -5,3 +5,4 @@ config CPU_INTEL_SOCKET_MPGA604 select CPU_INTEL_MODEL_F4X select MMX select SSE + select UDELAY_TSC diff --git a/src/cpu/via/model_c3/Kconfig b/src/cpu/via/model_c3/Kconfig index 2664d87d61..881243111a 100644 --- a/src/cpu/via/model_c3/Kconfig +++ b/src/cpu/via/model_c3/Kconfig @@ -1,2 +1,3 @@ config CPU_VIA_C3 bool + select UDELAY_TSC diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index 64797b1af0..2fd02d096b 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -30,9 +30,9 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o # ./ssdt.o is in northbridge/amd/amdk8/Config.lb -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt4.o +obj-y += ssdt2.o +obj-y += ssdt3.o +obj-y += ssdt4.o driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o # This is part of the conversion to init-obj and away from included code. @@ -55,26 +55,26 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds ifdef POST_EVALUATION $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl - iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl - mv dsdt.hex $@ + iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl + mv $(obj)/dsdt.hex $@ $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ -$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl - iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl - perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex - mv pci2.hex ssdt2.c +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl + iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex + mv $(obj)/pci2.hex $@ -$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl" - iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/ - perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex - mv pci3.hex ssdt3.c +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl + iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex + mv $(obj)/pci3.hex $@ -$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" - iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl - perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex - mv pci4.hex ssdt4.c +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl + iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex + mv $(obj)/pci4.hex $@ $(obj)/mainboard/$(MAINBOARDDIR)/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 $@ diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig index e53f6833bc..e1135ee4dd 100644 --- a/src/mainboard/digitallogic/adl855pc/Kconfig +++ b/src/mainboard/digitallogic/adl855pc/Kconfig @@ -6,7 +6,6 @@ config BOARD_DIGITALLOGIC_ADL855PC select SOUTHBRIDGE_INTEL_I82801DBM select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE - select UDELAY_TSC select BOARD_ROMSIZE_KB_1024 config MAINBOARD_DIR diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig index e5f69bd129..d4609e56ca 100644 --- a/src/mainboard/iei/juki-511p/Kconfig +++ b/src/mainboard/iei/juki-511p/Kconfig @@ -27,7 +27,6 @@ config BOARD_IEI_JUKI_511P select SUPERIO_WINBOND_W83977F select PIRQ_ROUTE select HAVE_OPTION_TABLE - select UDELAY_TSC select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig index 28b82a35a6..5d0c4972ba 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig +++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig @@ -7,7 +7,6 @@ config BOARD_IEI_PCISA_LX_800_R10 select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE select PIRQ_ROUTE - select UDELAY_TSC select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc index c2a3adeaef..85ec46d3e5 100644 --- a/src/mainboard/iwill/dk8_htx/Makefile.inc +++ b/src/mainboard/iwill/dk8_htx/Makefile.inc @@ -30,10 +30,10 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o # ./ssdt.o is in northbridge/amd/amdk8/Config.lb -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt4.o -obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt5.o +obj-y += ssdt2.o +obj-y += ssdt3.o +obj-y += ssdt4.o +obj-y += ssdt5.o # This is part of the conversion to init-obj and away from included code. @@ -55,31 +55,31 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds ifdef POST_EVALUATION $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl - iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl - mv dsdt.hex $@ + iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl + mv $(obj)/dsdt.hex $@ $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ -$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl - iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl - perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex - mv pci2.hex ssdt2.c - -$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl" - iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/ - perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex - mv pci3.hex ssdt3.c - -$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" - iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl - perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex - mv pci4.hex ssdt4.c - -$(obj)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl" - iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci5.asl - perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex - mv pci5.hex ssdt5.c +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl + iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex + mv $(obj)/pci2.hex $@ + +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl + iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex + mv $(obj)/pci3.hex $@ + +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl + iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex + mv $(obj)/pci4.hex $@ + +$(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl + iasl -p $(obj)/pci5 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl + perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/pci5.hex + mv $(obj)/pci5.hex $@ $(obj)/mainboard/$(MAINBOARDDIR)/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 $@ diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig index 930f27f38b..7999f0dd2f 100644 --- a/src/mainboard/msi/ms6178/Kconfig +++ b/src/mainboard/msi/ms6178/Kconfig @@ -26,7 +26,6 @@ config BOARD_MSI_MS_6178 select SOUTHBRIDGE_INTEL_I82801XX select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE - select UDELAY_IO select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR -- cgit v1.2.3