Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ACPI build on a couple of boards (now that it's active)

Browse source 
Fix timer handling on amd/sc520 systems
Match UDELAY_* configuration of newconfig in Kconfig

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5054 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2010-01-25 15:17:11 +00:00
parent 3e4a0b87c8
commit e8d943f266
10 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/amd/sc520/Kconfig
View file

@ -6,3 +6,7 @@ config UDELAY_IO
default n default n
depends on CPU_AMD_SC520 depends on CPU_AMD_SC520
config HAVE_INIT_TIMER
bool
default n
depends on CPU_AMD_SC520

1
src/cpu/intel/socket_PGA370/Kconfig
View file

@ -21,3 +21,4 @@
config CPU_INTEL_SOCKET_PGA370 config CPU_INTEL_SOCKET_PGA370
bool bool
select MMX select MMX
select UDELAY_TSC

1
src/cpu/intel/socket_mPGA604/Kconfig
View file

@ -5,3 +5,4 @@ config CPU_INTEL_SOCKET_MPGA604
select CPU_INTEL_MODEL_F4X select CPU_INTEL_MODEL_F4X
select MMX select MMX
select SSE select SSE
select UDELAY_TSC

1
src/cpu/via/model_c3/Kconfig
View file

@ -1,2 +1,3 @@
config CPU_VIA_C3 config CPU_VIA_C3
bool bool
select UDELAY_TSC

34
src/mainboard/amd/serengeti_cheetah/Makefile.inc
View file

@ -30,9 +30,9 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
# ./ssdt.o is in northbridge/amd/amdk8/Config.lb # ./ssdt.o is in northbridge/amd/amdk8/Config.lb
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o obj-y += ssdt2.o
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o obj-y += ssdt3.o
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt4.o obj-y += ssdt4.o
driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o
# This is part of the conversion to init-obj and away from included code. # 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 ifdef POST_EVALUATION
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
mv dsdt.hex $@ mv $(obj)/dsdt.hex $@
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
mv pci2.hex ssdt2.c mv $(obj)/pci2.hex $@
$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl" $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/ iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
mv pci3.hex ssdt3.c mv $(obj)/pci3.hex $@
$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
mv pci4.hex ssdt4.c mv $(obj)/pci4.hex $@
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h $(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 $@ $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@

1
src/mainboard/digitallogic/adl855pc/Kconfig
View file

@ -6,7 +6,6 @@ config BOARD_DIGITALLOGIC_ADL855PC
select SOUTHBRIDGE_INTEL_I82801DBM select SOUTHBRIDGE_INTEL_I82801DBM
select SUPERIO_WINBOND_W83627HF select SUPERIO_WINBOND_W83627HF
select HAVE_PIRQ_TABLE select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_1024 select BOARD_ROMSIZE_KB_1024
config MAINBOARD_DIR config MAINBOARD_DIR

1
src/mainboard/iei/juki-511p/Kconfig
View file

@ -27,7 +27,6 @@ config BOARD_IEI_JUKI_511P
select SUPERIO_WINBOND_W83977F select SUPERIO_WINBOND_W83977F
select PIRQ_ROUTE select PIRQ_ROUTE
select HAVE_OPTION_TABLE select HAVE_OPTION_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_256 select BOARD_ROMSIZE_KB_256
config MAINBOARD_DIR config MAINBOARD_DIR

1
src/mainboard/iei/pcisa-lx-800-r10/Kconfig
View file

@ -7,7 +7,6 @@ config BOARD_IEI_PCISA_LX_800_R10
select SUPERIO_WINBOND_W83627HF select SUPERIO_WINBOND_W83627HF
select HAVE_PIRQ_TABLE select HAVE_PIRQ_TABLE
select PIRQ_ROUTE select PIRQ_ROUTE
select UDELAY_TSC
select USE_DCACHE_RAM select USE_DCACHE_RAM
select USE_PRINTK_IN_CAR select USE_PRINTK_IN_CAR
select BOARD_ROMSIZE_KB_256 select BOARD_ROMSIZE_KB_256

44
src/mainboard/iwill/dk8_htx/Makefile.inc
View file

@ -30,10 +30,10 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
# ./ssdt.o is in northbridge/amd/amdk8/Config.lb # ./ssdt.o is in northbridge/amd/amdk8/Config.lb
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o obj-y += ssdt2.o
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o obj-y += ssdt3.o
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt4.o obj-y += ssdt4.o
obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt5.o obj-y += ssdt5.o
# This is part of the conversion to init-obj and away from included code. # 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 ifdef POST_EVALUATION
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
mv dsdt.hex $@ mv $(obj)/dsdt.hex $@
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
$(obj)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
iasl -p $(CURDIR)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl iasl -p $(obj)/pci2 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' pci2.hex perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
mv pci2.hex ssdt2.c mv $(obj)/pci2.hex $@
$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl" $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
iasl -p $(CURDIR)/pci3 -tc $(CONFIG_MAINBOARD)/ iasl -p $(obj)/pci3 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' pci3.hex perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
mv pci3.hex ssdt3.c mv $(obj)/pci3.hex $@
$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl iasl -p $(obj)/pci4 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
mv pci4.hex ssdt4.c mv $(obj)/pci4.hex $@
$(obj)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl" $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
iasl -p $(CURDIR)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci5.asl iasl -p $(obj)/pci5 -tc $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' pci5.hex perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/pci5.hex
mv pci5.hex ssdt5.c mv $(obj)/pci5.hex $@
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h $(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 $@ $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@

1
src/mainboard/msi/ms6178/Kconfig
View file

@ -26,7 +26,6 @@ config BOARD_MSI_MS_6178
select SOUTHBRIDGE_INTEL_I82801XX select SOUTHBRIDGE_INTEL_I82801XX
select SUPERIO_WINBOND_W83627HF select SUPERIO_WINBOND_W83627HF
select HAVE_PIRQ_TABLE select HAVE_PIRQ_TABLE
select UDELAY_IO
select BOARD_ROMSIZE_KB_512 select BOARD_ROMSIZE_KB_512
config MAINBOARD_DIR config MAINBOARD_DIR