[coreboot] [commit] r5094 - in trunk: . src/mainboard src/mainboard/amd/dbm690t src/mainboard/amd/dbm690t/acpi src/mainboard/amd/pistachio src/mainboard/amd/pistachio/acpi src/mainboard/amd/serengeti_cheetah ...
repository service
svn at coreboot.org
Mon Feb 8 16:46:38 CET 2010
Author: oxygene
Date: Mon Feb 8 16:46:37 2010
New Revision: 5094
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5094
Log:
Clean up ACPI:
- unify all iasl related rules into the toplevel Makefile
- build a filesystem standard for ACPI files and use it
- pass ACPI sources through cpp, so constants can be shared
between C and ACPI more easily
- use cpp's #include instead of ACPI's Include() so cpp gets
the whole picture
Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Added:
trunk/src/mainboard/amd/dbm690t/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/amd/dbm690t/acpi/dsdt.asl
trunk/src/mainboard/amd/pistachio/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/amd/pistachio/acpi/dsdt.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/
- copied from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/
trunk/src/mainboard/amd/serengeti_cheetah/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl
trunk/src/mainboard/amd/serengeti_cheetah/ssdt2.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci2.asl
trunk/src/mainboard/amd/serengeti_cheetah/ssdt3.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci3.asl
trunk/src/mainboard/amd/serengeti_cheetah/ssdt4.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci4.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/
- copied from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/
trunk/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
- copied, changed from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl
trunk/src/mainboard/intel/eagleheights/dsdt.asl
- copied unchanged from r5093, trunk/src/mainboard/intel/eagleheights/dsdt.dsl
trunk/src/mainboard/iwill/dk8_htx/acpi/
- copied from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/
trunk/src/mainboard/iwill/dk8_htx/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl
trunk/src/mainboard/iwill/dk8_htx/ssdt2.asl
- copied, changed from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci2.asl
trunk/src/mainboard/iwill/dk8_htx/ssdt3.asl
- copied, changed from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci3.asl
trunk/src/mainboard/iwill/dk8_htx/ssdt4.asl
- copied, changed from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci4.asl
trunk/src/mainboard/iwill/dk8_htx/ssdt5.asl
- copied, changed from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci5.asl
trunk/src/mainboard/kontron/kt690/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/kontron/kt690/acpi/dsdt.asl
trunk/src/mainboard/technexion/tim5690/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/technexion/tim5690/acpi/dsdt.asl
trunk/src/mainboard/technexion/tim8690/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/technexion/tim8690/acpi/dsdt.asl
trunk/src/mainboard/tyan/s2891/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/tyan/s2891/dsdt.dsl
trunk/src/mainboard/tyan/s2892/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/tyan/s2892/dsdt.dsl
trunk/src/mainboard/tyan/s2895/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/tyan/s2895/dsdt.dsl
trunk/src/mainboard/via/epia-n/acpi/
trunk/src/mainboard/via/epia-n/acpi/irq_links.asl
- copied unchanged from r5093, trunk/src/mainboard/via/epia-n/irq_links.asl
trunk/src/mainboard/via/epia-n/acpi/pata_methods.asl
- copied unchanged from r5093, trunk/src/mainboard/via/epia-n/pata_methods.asl
trunk/src/mainboard/via/epia-n/acpi/pci_init.asl
- copied unchanged from r5093, trunk/src/mainboard/via/epia-n/pci_init.asl
trunk/src/mainboard/via/epia-n/acpi/sb_physical.asl
- copied, changed from r5093, trunk/src/mainboard/via/epia-n/sb_physical.asl
trunk/src/mainboard/via/vt8454c/acpi/
trunk/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
- copied unchanged from r5093, trunk/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl
trunk/src/mainboard/via/vt8454c/acpi/irq.asl
- copied unchanged from r5093, trunk/src/mainboard/via/vt8454c/irq.dsl
trunk/src/mainboard/via/vt8454c/dsdt.asl
- copied, changed from r5093, trunk/src/mainboard/via/vt8454c/dsdt.dsl
trunk/src/northbridge/amd/amdfam10/ssdt.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/ssdt.dsl
trunk/src/northbridge/amd/amdfam10/sspr1.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/sspr1.dsl
trunk/src/northbridge/amd/amdfam10/sspr2.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/sspr2.dsl
trunk/src/northbridge/amd/amdfam10/sspr3.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/sspr3.dsl
trunk/src/northbridge/amd/amdfam10/sspr4.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/sspr4.dsl
trunk/src/northbridge/amd/amdfam10/sspr5.asl
- copied unchanged from r5093, trunk/src/northbridge/amd/amdfam10/sspr5.dsl
Deleted:
trunk/src/mainboard/amd/dbm690t/acpi/dsdt.asl
trunk/src/mainboard/amd/pistachio/acpi/dsdt.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/dsdt_lb.dsl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci2.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci3.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci4.asl
trunk/src/mainboard/amd/serengeti_cheetah/dx/
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/dsdt_lb.dsl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/
trunk/src/mainboard/intel/eagleheights/dsdt.dsl
trunk/src/mainboard/iwill/dk8_htx/acpi/dsdt_lb.dsl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci2.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci3.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci4.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci5.asl
trunk/src/mainboard/iwill/dk8_htx/dx/
trunk/src/mainboard/kontron/kt690/acpi/dsdt.asl
trunk/src/mainboard/technexion/tim5690/acpi/dsdt.asl
trunk/src/mainboard/technexion/tim8690/acpi/dsdt.asl
trunk/src/mainboard/tyan/s2891/dsdt.dsl
trunk/src/mainboard/tyan/s2892/dsdt.dsl
trunk/src/mainboard/tyan/s2895/dsdt.dsl
trunk/src/mainboard/via/epia-n/irq_links.asl
trunk/src/mainboard/via/epia-n/pata_methods.asl
trunk/src/mainboard/via/epia-n/pci_init.asl
trunk/src/mainboard/via/epia-n/sb_physical.asl
trunk/src/mainboard/via/vt8454c/dsdt.dsl
trunk/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl
trunk/src/mainboard/via/vt8454c/irq.dsl
trunk/src/northbridge/amd/amdfam10/ssdt.dsl
trunk/src/northbridge/amd/amdfam10/sspr1.dsl
trunk/src/northbridge/amd/amdfam10/sspr2.dsl
trunk/src/northbridge/amd/amdfam10/sspr3.dsl
trunk/src/northbridge/amd/amdfam10/sspr4.dsl
trunk/src/northbridge/amd/amdfam10/sspr5.dsl
Modified:
trunk/Makefile
trunk/src/mainboard/Makefile.k8_CAR.inc
trunk/src/mainboard/Makefile.k8_ck804.inc
trunk/src/mainboard/amd/dbm690t/Makefile.inc
trunk/src/mainboard/amd/dbm690t/acpi/debug.asl
trunk/src/mainboard/amd/dbm690t/acpi/globutil.asl
trunk/src/mainboard/amd/dbm690t/acpi/ide.asl
trunk/src/mainboard/amd/dbm690t/acpi/routing.asl
trunk/src/mainboard/amd/dbm690t/acpi/sata.asl
trunk/src/mainboard/amd/dbm690t/acpi/usb.asl
trunk/src/mainboard/amd/pistachio/Makefile.inc
trunk/src/mainboard/amd/pistachio/acpi/debug.asl
trunk/src/mainboard/amd/pistachio/acpi/globutil.asl
trunk/src/mainboard/amd/pistachio/acpi/ide.asl
trunk/src/mainboard/amd/pistachio/acpi/routing.asl
trunk/src/mainboard/amd/pistachio/acpi/sata.asl
trunk/src/mainboard/amd/pistachio/acpi/usb.asl
trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc
trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl
trunk/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
trunk/src/mainboard/asus/a8n_e/Makefile.inc
trunk/src/mainboard/asus/a8v-e_se/Makefile.inc
trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc
trunk/src/mainboard/asus/m2v-mx_se/dsdt.asl
trunk/src/mainboard/bcom/winnetp680/Makefile.inc
trunk/src/mainboard/gigabyte/m57sli/Makefile.inc
trunk/src/mainboard/gigabyte/m57sli/dsdt.asl
trunk/src/mainboard/intel/d945gclf/Makefile.inc
trunk/src/mainboard/intel/eagleheights/Makefile.inc
trunk/src/mainboard/iwill/dk8_htx/Makefile.inc
trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl
trunk/src/mainboard/iwill/dk8_htx/acpi/superio.asl
trunk/src/mainboard/kontron/986lcd-m/Makefile.inc
trunk/src/mainboard/kontron/kt690/Makefile.inc
trunk/src/mainboard/kontron/kt690/acpi/debug.asl
trunk/src/mainboard/kontron/kt690/acpi/globutil.asl
trunk/src/mainboard/kontron/kt690/acpi/ide.asl
trunk/src/mainboard/kontron/kt690/acpi/routing.asl
trunk/src/mainboard/kontron/kt690/acpi/sata.asl
trunk/src/mainboard/kontron/kt690/acpi/usb.asl
trunk/src/mainboard/msi/ms7260/Makefile.inc
trunk/src/mainboard/msi/ms9282/Makefile.inc
trunk/src/mainboard/roda/rk886ex/Makefile.inc
trunk/src/mainboard/supermicro/h8dme/Makefile.inc
trunk/src/mainboard/supermicro/h8dmr/Makefile.inc
trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
trunk/src/mainboard/technexion/tim5690/Makefile.inc
trunk/src/mainboard/technexion/tim5690/acpi/debug.asl
trunk/src/mainboard/technexion/tim5690/acpi/globutil.asl
trunk/src/mainboard/technexion/tim5690/acpi/ide.asl
trunk/src/mainboard/technexion/tim5690/acpi/routing.asl
trunk/src/mainboard/technexion/tim5690/acpi/sata.asl
trunk/src/mainboard/technexion/tim5690/acpi/usb.asl
trunk/src/mainboard/technexion/tim8690/Makefile.inc
trunk/src/mainboard/technexion/tim8690/acpi/debug.asl
trunk/src/mainboard/technexion/tim8690/acpi/globutil.asl
trunk/src/mainboard/technexion/tim8690/acpi/ide.asl
trunk/src/mainboard/technexion/tim8690/acpi/routing.asl
trunk/src/mainboard/technexion/tim8690/acpi/sata.asl
trunk/src/mainboard/technexion/tim8690/acpi/usb.asl
trunk/src/mainboard/tyan/s2735/Makefile.inc
trunk/src/mainboard/tyan/s2912/Makefile.inc
trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc
trunk/src/mainboard/via/epia-m/Makefile.inc
trunk/src/mainboard/via/epia-n/Makefile.inc
trunk/src/mainboard/via/epia-n/dsdt.asl
trunk/src/mainboard/via/epia/Makefile.inc
trunk/src/mainboard/via/vt8454c/Makefile.inc
trunk/src/northbridge/amd/amdfam10/Makefile.inc
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/Makefile Mon Feb 8 16:46:37 2010 (r5094)
@@ -138,12 +138,13 @@
$(eval $(call evaluate_subdirs))
-define c_dsl_template
-$(obj)/$(1)%.c: src/$(1)%.dsl $(obj)/build.h
+define objs_dsl_template
+$(obj)/$(1)%.o: src/$(1)%.asl
@printf " IASL $$(subst $$(shell pwd)/,,$$(@))\n"
- iasl -p $$(basename $$@) -tc $$<
- perl -pi -e 's/AmlCode/AmlCode_$$(notdir $$(basename $$@))/g' $$(basename $$@).hex
- mv $$(basename $$@).hex $$@
+ $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
+ iasl -p $$(basename $$@) -tc $$(basename $$@).asl
+ mv $$(basename $$@).hex $$(basename $$@).c
+ $(CC) -m32 $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$@).c
endef
define objs_c_template
@@ -196,7 +197,7 @@
usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
-$(eval $(call usetemplate,c,dsl))
+$(eval $(call usetemplate,objs,dsl))
$(eval $(call usetemplate,objs,c))
$(eval $(call usetemplate,objs,S))
$(eval $(call usetemplate,initobjs,c))
Modified: trunk/src/mainboard/Makefile.k8_CAR.inc
==============================================================================
--- trunk/src/mainboard/Makefile.k8_CAR.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/Makefile.k8_CAR.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/Makefile.k8_ck804.inc
==============================================================================
--- trunk/src/mainboard/Makefile.k8_ck804.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/Makefile.k8_ck804.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -53,13 +53,6 @@
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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/amd/dbm690t/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/amd/dbm690t/acpi/debug.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/debug.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/debug.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001
)
{
- Include ("debug.asl")
+ #include "debug.asl"
}
*/
Modified: trunk/src/mainboard/amd/dbm690t/acpi/globutil.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/globutil.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/globutil.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -19,7 +19,7 @@
/*
Scope(\_SB) {
- Include ("globutil.asl")
+ #include "globutil.asl"
}
*/
Modified: trunk/src/mainboard/amd/dbm690t/acpi/ide.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/ide.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/ide.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
Device(PCI0) {
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "ide.asl"
}
}
}
Modified: trunk/src/mainboard/amd/dbm690t/acpi/routing.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/routing.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/routing.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -21,7 +21,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("routing.asl")
+ #include "routing.asl"
}
*/
Modified: trunk/src/mainboard/amd/dbm690t/acpi/sata.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/sata.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/sata.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -24,7 +24,7 @@
Device(PCI0) {
Device(SATA) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "sata.asl"
}
}
}
Modified: trunk/src/mainboard/amd/dbm690t/acpi/usb.asl
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/usb.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/dbm690t/acpi/usb.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("usb.asl")
+ #include "usb.asl"
}
*/
Method(UCOC, 0) {
Copied and modified: trunk/src/mainboard/amd/dbm690t/dsdt.asl (from r5093, trunk/src/mainboard/amd/dbm690t/acpi/dsdt.asl)
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/dbm690t/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001 /* OEM Revision */
)
{ /* Start of ASL file */
- /* Include ("debug.asl") */ /* Include global debug methods if needed */
+ /* #include "acpi/debug.asl" */ /* Include global debug methods if needed */
/* Data to be patched by the BIOS during POST */
/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@
}
}
- Include ("routing.asl")
+ #include "acpi/routing.asl"
Scope(\_SB) {
@@ -1119,11 +1119,11 @@
} /* End Scope GPE */
- Include ("usb.asl")
+ #include "acpi/usb.asl"
/* South Bridge */
Scope(\_SB) { /* Start \_SB scope */
- Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+ #include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
/* _SB.PCI0 */
/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@
/* Describe the Southbridge devices */
Device(STCR) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "acpi/sata.asl"
} /* end STCR */
Device(UOH1) {
@@ -1262,7 +1262,7 @@
/* Primary (and only) IDE channel */
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "acpi/ide.asl"
} /* end IDEC */
Device(AZHD) {
Modified: trunk/src/mainboard/amd/pistachio/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/pistachio/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/amd/pistachio/acpi/debug.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/debug.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/debug.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001
)
{
- Include ("debug.asl")
+ #include "debug.asl"
}
*/
Modified: trunk/src/mainboard/amd/pistachio/acpi/globutil.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/globutil.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/globutil.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -19,7 +19,7 @@
/*
Scope(\_SB) {
- Include ("globutil.asl")
+ #include "globutil.asl"
}
*/
Modified: trunk/src/mainboard/amd/pistachio/acpi/ide.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/ide.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/ide.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
Device(PCI0) {
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "ide.asl"
}
}
}
Modified: trunk/src/mainboard/amd/pistachio/acpi/routing.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/routing.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/routing.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -21,7 +21,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("routing.asl")
+ #include "routing.asl"
}
*/
Modified: trunk/src/mainboard/amd/pistachio/acpi/sata.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/sata.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/sata.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -24,7 +24,7 @@
Device(PCI0) {
Device(SATA) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "sata.asl"
}
}
}
Modified: trunk/src/mainboard/amd/pistachio/acpi/usb.asl
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/usb.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/pistachio/acpi/usb.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("usb.asl")
+ #include "usb.asl"
}
*/
Method(UCOC, 0) {
Copied and modified: trunk/src/mainboard/amd/pistachio/dsdt.asl (from r5093, trunk/src/mainboard/amd/pistachio/acpi/dsdt.asl)
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/pistachio/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001 /* OEM Revision */
)
{ /* Start of ASL file */
- /* Include ("debug.asl") */ /* Include global debug methods if needed */
+ /* #include "acpi/debug.asl" */ /* Include global debug methods if needed */
/* Data to be patched by the BIOS during POST */
/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@
}
}
- Include ("routing.asl")
+ #include "acpi/routing.asl"
Scope(\_SB) {
@@ -1118,11 +1118,11 @@
} /* End Scope GPE */
- Include ("usb.asl")
+ #include "acpi/usb.asl"
/* South Bridge */
Scope(\_SB) { /* Start \_SB scope */
- Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+ #include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
/* _SB.PCI0 */
/* Note: Only need HID on Primary Bus */
@@ -1221,7 +1221,7 @@
/* Describe the Southbridge devices */
Device(STCR) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "acpi/sata.asl"
} /* end STCR */
Device(UOH1) {
@@ -1261,7 +1261,7 @@
/* Primary (and only) IDE channel */
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "acpi/ide.asl"
} /* end IDEC */
Device(AZHD) {
Modified: trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -26,13 +26,12 @@
obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
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-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.
@@ -54,28 +53,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
- 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)/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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/amd8111.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -89,9 +89,9 @@
}
}
- Include ("amd8111_pic.asl")
+ #include "amd8111_pic.asl"
- Include ("amd8111_isa.asl")
+ #include "amd8111_isa.asl"
Device (TP2P)
{
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/amd8111_isa.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -170,7 +170,7 @@
IRQNoFlags () {1}
})
}
- Include ("superio.asl")
+ #include "superio.asl"
}
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci0_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1,2 +1,2 @@
- Include ("amd8111.asl") //real SB at first
- Include ("amd8131.asl")
+ #include "amd8111.asl" //real SB at first
+ #include "amd8131.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci2_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8132_2.asl")
+ #include "amd8132_2.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci3_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8151.asl")
+ #include "amd8151.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci4_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8131_2.asl")
+ #include "amd8131_2.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/superio.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi/superio.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
-// Include ("w83627hf.asl")
+// #include "w83627hf.asl"
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah/dsdt.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -103,7 +103,7 @@
Return (Local3)
}
- Include ("pci0_hc.asl")
+ #include "acpi/pci0_hc.asl"
}
Device (PCI1)
@@ -206,7 +206,7 @@
Z00A, 8
}
- Include ("../../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
}
Modified: trunk/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt Mon Feb 8 16:46:37 2010 (r5094)
@@ -1,12 +1,12 @@
At this time, For acpi support We got
1. support AMK K8 SRAT --- dynamically (coreboot run-time) (src/northbridge/amd/amdk8/amdk8_acpi.c)
2. support MADT ---- dynamically (coreboot run-time) (src/northbridge/amd/amdk8/amdk8_acpi.c , src/mainboard/amd/serengeti_cheetah/acpi_tables.c)
-3. support DSDT ---- dynamically (Compile time, coreboot run-time, ACPI run-time) (src/mainboard/amd/serengeti_cheetah/{dx/*, get_bus_conf.c}, src/northbridge/amd/amdk8/get_sblk_pci1234.c)
+3. support DSDT ---- dynamically (Compile time, coreboot run-time, ACPI run-time) (src/mainboard/amd/serengeti_cheetah/{acpi/*, get_bus_conf.c}, src/northbridge/amd/amdk8/get_sblk_pci1234.c)
4. Chipset support: amd8111, amd8132
The developers need to change for different MB
-Change dx/dsdt_lb.dsl, according to MB layout
+Change dsdt.asl, according to MB layout
pci1, pci2, pci3, pci4, ...., pci8
if there is HT-IO board, may use pci2.asl.... to create ssdt2.c, and ssdt3,c and ssdt4.c, ....ssdt8.c
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah/ssdt2.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci2.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci2.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah/ssdt2.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci2_hc.asl")
+ #include "acpi/pci2_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah/ssdt3.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci3.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci3.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah/ssdt3.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci3_hc.asl")
+ #include "acpi/pci3_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah/ssdt4.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah/dx/pci4.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/dx/pci4.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah/ssdt4.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci4_hc.asl")
+ #include "acpi/pci4_hc.asl"
}
}
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -51,33 +51,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
- iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $<
- 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)/ssdt2.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci2.asl
- iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci2 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex
- mv $(obj)/mainboard/$(MAINBOARDDIR)/pci2.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl
- iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci3 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex
- mv $(obj)/mainboard/$(MAINBOARDDIR)/pci3.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl
- iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci4 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex
- mv $(obj)/mainboard/$(MAINBOARDDIR)/pci4.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci5.asl
- iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/pci5 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_ssdt5/g' $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex
- mv $(obj)/mainboard/$(MAINBOARDDIR)/pci5.hex $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -97,9 +97,9 @@
}
}
- Include ("amd8111_pic.asl")
+ #include "amd8111_pic.asl"
- Include ("amd8111_isa.asl")
+ #include "amd8111_isa.asl"
Device (TP2P)
{
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -186,7 +186,7 @@
IRQNoFlags () {1}
})
}
- Include ("superio.asl")
+ #include "superio.asl"
}
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -16,5 +16,5 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- Include ("amd8111.asl") //real SB at first
- Include ("amd8132.asl")
+ #include "amd8111.asl" //real SB at first
+ #include "amd8132.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -17,4 +17,4 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- Include ("amd8132_2.asl")
+ #include "amd8132_2.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -17,4 +17,4 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- Include ("amd8151.asl")
+ #include "amd8151.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -17,4 +17,4 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- Include ("amd8131_2.asl")
+ #include "amd8131_2.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -17,4 +17,4 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
- Include ("htx_no_ioapic.asl")
+ #include "htx_no_ioapic.asl"
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -17,4 +17,4 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// Include ("w83627hf.asl")
+// #include "w83627hf.asl"
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -119,7 +119,7 @@
Return (Local3)
}
- Include ("pci0_hc.asl")
+ #include "acpi/pci0_hc.asl"
}
Device (PCI1)
@@ -238,5 +238,5 @@
Z00A, 8
}
- Include ("../../../../../src/northbridge/amd/amdfam10/amdfam10_util.asl")
+ #include "northbridge/amd/amdfam10/amdfam10_util.asl"
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -75,7 +75,7 @@
Return (Local3)
}
- Include ("pci2_hc.asl")
+ #include "acpi/pci2_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -75,7 +75,7 @@
Return (Local3)
}
- Include ("pci3_hc.asl")
+ #include "acpi/pci3_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -75,7 +75,7 @@
Return (Local3)
}
- Include ("pci4_hc.asl")
+ #include "acpi/pci4_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl (from r5093, trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl)
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -76,7 +76,7 @@
Return (Local3)
}
- Include ("pci5_hc.asl")
+ #include "acpi/pci5_hc.asl"
}
}
Modified: trunk/src/mainboard/asus/a8n_e/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/a8n_e/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/asus/a8n_e/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -45,28 +45,6 @@
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 $@
-
-$(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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/asus/a8v-e_se/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/a8v-e_se/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/asus/a8v-e_se/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,13 +27,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/asus/m2v-mx_se/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -39,13 +39,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/asus/m2v-mx_se/dsdt.asl
==============================================================================
--- trunk/src/mainboard/asus/m2v-mx_se/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/asus/m2v-mx_se/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
Modified: trunk/src/mainboard/bcom/winnetp680/Makefile.inc
==============================================================================
--- trunk/src/mainboard/bcom/winnetp680/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/bcom/winnetp680/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -44,13 +44,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/gigabyte/m57sli/Makefile.inc
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/gigabyte/m57sli/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -53,13 +53,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
Modified: trunk/src/mainboard/gigabyte/m57sli/dsdt.asl
==============================================================================
--- trunk/src/mainboard/gigabyte/m57sli/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/gigabyte/m57sli/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -23,7 +23,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
Modified: trunk/src/mainboard/intel/d945gclf/Makefile.inc
==============================================================================
--- trunk/src/mainboard/intel/d945gclf/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/intel/d945gclf/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -51,14 +51,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/intel/eagleheights/Makefile.inc
==============================================================================
--- trunk/src/mainboard/intel/eagleheights/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/intel/eagleheights/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -26,13 +26,6 @@
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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Copied: trunk/src/mainboard/intel/eagleheights/dsdt.asl (from r5093, trunk/src/mainboard/intel/eagleheights/dsdt.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/intel/eagleheights/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/intel/eagleheights/dsdt.dsl)
@@ -0,0 +1,1079 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 Thomas Jourdan <thomas.jourdan at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+DefinitionBlock ("DSDT", "DSDT", 1, "EAGLE", "COREBOOT", 0x0000001)
+{
+ Scope (\_PR)
+ {
+ Processor (CPU1, 0x01, 0x00000810, 0x06)
+ {
+ OperationRegion (STBL, SystemMemory, 0xFFFF0000, 0xFFFF)
+ Name (NCPU, 0x80)
+ Name (TYPE, 0x80000000)
+ Name (HNDL, 0x80000000)
+ Name (CFGD, 0x80000000)
+ Name (TBLD, 0x80)
+ Method (_PDC, 1, NotSerialized)
+ {
+ }
+ }
+ }
+
+ Scope (\_PR)
+ {
+ Processor (CPU2, 0x02, 0x00000000, 0x00)
+ {
+ OperationRegion (STBL, SystemMemory, 0xFFFF0000, 0xFFFF)
+ Name (NCPU, 0x80)
+ Name (TYPE, 0x80000000)
+ Name (HNDL, 0x80000000)
+ Name (CFGD, 0x80000000)
+ Name (TBLD, 0x80)
+ Method (_PDC, 1, NotSerialized)
+ {
+ }
+ }
+ }
+
+ /* For now only define 2 power states:
+ * - S0 which is fully on
+ * - S5 which is soft off
+ * Any others would involve declaring the wake up methods.
+ */
+ Name (\_S0, Package () { 0x00, 0x00, 0x00, 0x00 })
+ Name (\_S5, Package () { 0x02, 0x02, 0x00, 0x00 })
+
+ Name (PICM, 0x00)
+ Method (_PIC, 1, NotSerialized)
+ {
+ Store (Arg0, PICM)
+ }
+
+ /* System bus */
+ Scope (\_SB)
+ {
+ /* Routing PCI0 */
+ Name (PR00, Package (0x0E)
+ {
+ Package (0x04){0x0001FFFF,0x00,LNKA,0x00}, /* EDMA INTA# */
+ Package (0x04){0x0002FFFF,0x00,LNKA,0x00}, /* PCIe port A */
+ Package (0x04){0x0002FFFF,0x01,LNKB,0x00},
+ Package (0x04){0x0002FFFF,0x02,LNKC,0x00},
+ Package (0x04){0x0002FFFF,0x03,LNKD,0x00},
+ Package (0x04){0x0003FFFF,0x00,LNKA,0x00}, /* PCIe port A1 */
+ Package (0x04){0x0003FFFF,0x01,LNKB,0x00},
+ Package (0x04){0x0003FFFF,0x02,LNKC,0x00},
+ Package (0x04){0x0003FFFF,0x03,LNKD,0x00},
+ Package (0x04){0x001CFFFF,0x00,LNKE,0x00}, /* PCIe port B */
+ Package (0x04){0x001DFFFF,0x00,LNKH,0x00}, /* UHCI/EHCI INTA# */
+ Package (0x04){0x001DFFFF,0x01,LNKD,0x00}, /* UHCI INTB# */
+ Package (0x04){0x001FFFFF,0x01,LNKD,0x00}, /* SATA/SMBUS INTB# */
+ Package (0x04){0x001FFFFF,0x03,LNKA,0x00} /* CHAP INTD# */
+ })
+ Name (AR00, Package (0x0E)
+ {
+ Package (0x04){0x0001FFFF,0x00,0x00,0x10}, /* EDMA INTA# */
+ Package (0x04){0x0002FFFF,0x00,0x00,0x10}, /* PCIe port A0 */
+ Package (0x04){0x0002FFFF,0x01,0x00,0x11},
+ Package (0x04){0x0002FFFF,0x02,0x00,0x12},
+ Package (0x04){0x0002FFFF,0x03,0x00,0x13},
+ Package (0x04){0x0003FFFF,0x00,0x00,0x10}, /* PCIe port A1 */
+ Package (0x04){0x0003FFFF,0x01,0x00,0x11},
+ Package (0x04){0x0003FFFF,0x02,0x00,0x12},
+ Package (0x04){0x0003FFFF,0x03,0x00,0x13},
+ Package (0x04){0x001CFFFF,0x00,0x00,0x14}, /* PCIe port B */
+ Package (0x04){0x001DFFFF,0x00,0x00,0x17}, /* UHCI/EHCI INTA# */
+ Package (0x04){0x001DFFFF,0x01,0x00,0x13}, /* UHCI INTB# */
+ Package (0x04){0x001FFFFF,0x01,0x00,0x13}, /* SATA/SMBUS INTB# */
+ Package (0x04){0x001FFFFF,0x0D,0x00,0x10} /* CHAP INTD# */
+ })
+ /* Routing PCIe Port A */
+ Name (PR0A, Package (0x04)
+ {
+ Package (0x04){0xFFFF,0x00,LNKA,0x00},
+ Package (0x04){0xFFFF,0x01,LNKB,0x00},
+ Package (0x04){0xFFFF,0x02,LNKC,0x00},
+ Package (0x04){0xFFFF,0x03,LNKD,0x00}
+ })
+ Name (AR0A, Package (0x04)
+ {
+ Package (0x04){0xFFFF,0x00,0x00,0x10},
+ Package (0x04){0xFFFF,0x01,0x00,0x11},
+ Package (0x04){0xFFFF,0x02,0x00,0x12},
+ Package (0x04){0xFFFF,0x03,0x00,0x13}
+ })
+ /* Routing PCIe Port B */
+ Name (PR0B, Package (0x04)
+ {
+ Package (0x04){0xFFFF,0x00,LNKA,0x00},
+ Package (0x04){0xFFFF,0x01,LNKB,0x00},
+ Package (0x04){0xFFFF,0x02,LNKC,0x00},
+ Package (0x04){0xFFFF,0x03,LNKD,0x00}
+ })
+ Name (AR0B, Package (0x04)
+ {
+ Package (0x04){0xFFFF,0x00,0x00,0x10},
+ Package (0x04){0xFFFF,0x01,0x00,0x11},
+ Package (0x04){0xFFFF,0x02,0x00,0x12},
+ Package (0x04){0xFFFF,0x03,0x00,0x13}
+ })
+ /* Routing Bus PCI */
+ Name (PR01, Package (0x04)
+ {
+ Package (0x04){0x0000FFFF,0x00,LNKA,0x00},
+ Package (0x04){0x0000FFFF,0x01,LNKB,0x00},
+ Package (0x04){0x0000FFFF,0x02,LNKC,0x00},
+ Package (0x04){0x0000FFFF,0x03,LNKD,0x00},
+ })
+ Name (AR01, Package (0x04)
+ {
+ Package (0x04){0x0000FFFF,0x00,0x00,0x10},
+ Package (0x04){0x0000FFFF,0x01,0x00,0x11},
+ Package (0x04){0x0000FFFF,0x02,0x00,0x12},
+ Package (0x04){0x0000FFFF,0x03,0x00,0x13},
+ })
+
+ Name (PRSA, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, )
+ {3,4,5,6,7,10,11,12,14,15}
+ })
+ Alias (PRSA, PRSB)
+ Alias (PRSA, PRSC)
+ Alias (PRSA, PRSD)
+ Alias (PRSA, PRSE)
+ Alias (PRSA, PRSF)
+ Alias (PRSA, PRSG)
+ Alias (PRSA, PRSH)
+
+ Device (PCI0)
+ {
+ Name (_HID, EisaId ("PNP0A08"))
+ Name (_CID, EisaId ("PNP0A03"))
+ Name (_ADR, 0x00)
+ Name (_SEG, 0x00)
+ Name (_UID, 0x00)
+ Name (_BBN, 0x00)
+
+ Name (SUPP, 0) /* PCI _OSC Support Field Value */
+ Name (CTRL, 0) /* PCI _OSC Control Field Value */
+
+ Method (_OSC, 4)
+ {
+ /* Check for proper GUID */
+ If (LEqual (Arg0, ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766")))
+ {
+ /* Create DWORD-adressable field from the Capabilities Buffer */
+ CreateDWordField (Arg3, 0, CDW1)
+ CreateDWordField (Arg3, 4, CDW2)
+ CreateDWordField (Arg3, 8, CDW3)
+
+ /* Save Capabilities DWord 2 & 3 */
+ Store (CDW2, SUPP)
+ Store (CDW3, CTRL)
+
+ /* Don't care of OS capabilites */
+ /* We support nothing (maybe we should add PCIe Capability Structure Control) */
+ And (CTRL, 0x00, CTRL)
+
+ /* Query flag clear ? */
+ If (Not (And (CDW1, 1)))
+ {
+ /* Nothing to do */
+ }
+
+ /* Unknown revision ? */
+ If (LNotEqual (Arg1, One))
+ {
+ Or (CDW1, 0x08, CDW1)
+ }
+
+ /* Capabilities bits masked ? */
+ If (LNotEqual (CDW3, CTRL))
+ {
+ Or (CDW1, 0x10, CDW1)
+ }
+
+ /* Update DWORD3 in the buffer */
+ Store (CTRL, CDW3)
+
+ Return (Arg3)
+ }
+ Else
+ {
+ /* Unrecognized UUID */
+ Or (CDW1, 4, CDW1)
+ Return (Arg3)
+ }
+ } /* End _OSC */
+
+ Method (_PRT, 0, NotSerialized)
+ {
+ If (PICM)
+ {
+ Return (AR00)
+ }
+
+ Return (PR00)
+ }
+
+ /* PCI Express Port A */
+ Device (EPA0)
+ {
+ Name (_ADR, 0x00020000)
+ Method (_PRT, 0, NotSerialized)
+ {
+ If (PICM)
+ {
+ Return (AR0A)
+ }
+
+ Return (PR0A)
+ }
+ }
+
+ /* PCI Express Port A1 */
+ Device (EPA1)
+ {
+ Name (_ADR, 0x00030000)
+ Method (_PRT, 0, NotSerialized)
+ {
+ If (PICM)
+ {
+ Return (AR0A)
+ }
+
+ Return (PR0A)
+ }
+ }
+
+ /* PCI Express Port B0 */
+ Device (EPB0)
+ {
+ Name (_ADR, 0x001C0000)
+ Method (_PRT, 0, NotSerialized)
+ {
+ If (PICM)
+ {
+ Return (AR0B)
+ }
+
+ Return (PR0B)
+ }
+ }
+
+ /* PCI Bridge */
+ Device (P0P1)
+ {
+ Name (_ADR, 0x001E0000)
+
+ Method (_PRT, 0, NotSerialized)
+ {
+ If (PICM)
+ {
+ Return (AR01)
+ }
+
+ Return (PR01)
+ }
+ }
+
+ /* LPC I/F Bridge */
+ Device (ISA) {
+ Name (_ADR, 0x001F0000)
+
+ /* MMCONF */
+ Device (^PCIE)
+ {
+ Name (_HID, EisaId ("PNP0C02"))
+ Name (_UID, 0x11)
+ Name (CRS, ResourceTemplate ()
+ {
+ Memory32Fixed (ReadOnly,
+ 0xE0000000, // Address Base
+ 0x10000000, // Address Length
+ _Y10)
+ })
+ Method (_CRS, 0, NotSerialized)
+ {
+ CreateDWordField (CRS, \_SB.PCI0.PCIE._Y10._BAS, BAS1)
+ CreateDWordField (CRS, \_SB.PCI0.PCIE._Y10._LEN, LEN1)
+ Store (0xE0000000, BAS1)
+ Store (0x10000000, LEN1)
+ Return (CRS)
+ }
+ }
+
+ /* PIC */
+ Device (PIC)
+ {
+ Name (_HID, EisaId ("PNP0000"))
+ Name (_CRS, ResourceTemplate()
+ {
+ IO (Decode16,
+ 0x0020,
+ 0x0020,
+ 0x00,
+ 0x02,
+ )
+ IO (Decode16,
+ 0x00A0,
+ 0x00A0,
+ 0x00,
+ 0x02,
+ )
+ IRQNoFlags ()
+ {2}
+ })
+ }
+
+ /* Real time clock */
+ Device (RTC0)
+ {
+ Name (_HID, EisaId ("PNP0B00"))
+ Name (_CRS, ResourceTemplate ()
+ {
+ IO (Decode16,
+ 0x0070,
+ 0x0070,
+ 0x00,
+ 0x02)
+ IRQNoFlags ()
+ {8}
+ })
+ }
+
+ Device (UAR1)
+ {
+ Name (_UID, 0x01)
+ Name (_HID, EisaId ("PNP0501"))
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (CMPR)
+ }
+
+ Name (CMPR, ResourceTemplate ()
+ {
+ StartDependentFn (0x00, 0x00)
+ {
+ IO (Decode16,0x03F8,0x03F8,0x01,0x08)
+ IRQNoFlags () {4}
+ DMA (Compatibility, NotBusMaster, Transfer8) {}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,0x03F8,0x03F8,0x01,0x08)
+ IRQNoFlags () {3,4,5,6,7,10,11,12}
+ DMA (Compatibility, NotBusMaster, Transfer8) {}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,0x02F8,0x02F8,0x01,0x08)
+ IRQNoFlags () {3,4,5,6,7,10,11,12}
+ DMA (Compatibility, NotBusMaster, Transfer8) {}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,0x03E8,0x03E8,0x01,0x08)
+ IRQNoFlags () {3,4,5,6,7,10,11,12}
+ DMA (Compatibility, NotBusMaster, Transfer8) {}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,0x02E8,0x02E8,0x01,0x08)
+ IRQNoFlags () {3,4,5,6,7,10,11,12}
+ DMA (Compatibility, NotBusMaster, Transfer8) {}
+ }
+ EndDependentFn ()
+ })
+ }
+
+ /* PS/2 keyboard (seems to be important for WinXP install) */
+ Device (KBD)
+ {
+ Name (_HID, EisaId ("PNP0303"))
+ Method (_STA, 0, NotSerialized)
+ {
+ Return (0x0f)
+ }
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (TMP, ResourceTemplate () {
+ IO (Decode16, 0x0060, 0x0060, 0x01, 0x01)
+ IO (Decode16, 0x0064, 0x0064, 0x01, 0x01)
+ IRQNoFlags () {1}
+ })
+ Return (TMP)
+ }
+ }
+
+ /* PS/2 mouse */
+ Device (MOU)
+ {
+ Name (_HID, EisaId ("PNP0F13"))
+ Method (_STA, 0, NotSerialized)
+ {
+ Return (0x0f)
+ }
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (TMP, ResourceTemplate () {
+ IRQNoFlags () {12}
+ })
+ Return (TMP)
+ }
+ }
+
+ /* COM ports of SIO */
+ Device(SIO) {
+ OperationRegion (PT4E, SystemIO, 0x4E, 0x02)
+ Field (PT4E, ByteAcc, NoLock, Preserve)
+ {
+ PO4E, 8,
+ PO4F, 8
+ }
+
+ IndexField (PO4E, PO4F, ByteAcc, NoLock, Preserve)
+ {
+ Offset (0x07),
+ ILDN, 8,
+ Offset (0x28),
+ SIUI, 8,
+ SIUC, 8,
+ Offset (0x30),
+ IACT, 8,
+ Offset (0x60),
+ IIOH, 8,
+ IIOL, 8,
+ Offset (0x70),
+ IINT, 8
+ }
+
+ Method (IENF, 0, NotSerialized)
+ {
+ Store (0x80, PO4E)
+ Store (0x86, PO4E)
+ }
+
+ Method (IEXF, 0, NotSerialized)
+ {
+ Store (0x68, PO4E)
+ Store (0x08, PO4E)
+ }
+
+ Device (COM1)
+ {
+ Name (_UID, 0x03)
+ Name (_HID, EisaId ("PNP0501"))
+ Method (_STA, 0, NotSerialized)
+ {
+ IENF ()
+ Store (0x04, ILDN)
+ Store (IACT, Local0)
+ IEXF ()
+ If (LEqual (Local0, 0xFF))
+ {
+ Return (0x00)
+ }
+
+ If (LEqual (Local0, One))
+ {
+ Return (0x0F)
+ }
+ Else
+ {
+ Return (0x0D)
+ }
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ IENF ()
+ Store (0x04, ILDN)
+ Store (Zero, IACT)
+ IEXF ()
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BFU1, ResourceTemplate ()
+ {
+ IO (Decode16,
+ 0x03F8, // Range Minimum
+ 0x03F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ _Y03)
+ IRQNoFlags (_Y04)
+ {5}
+ })
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM1._CRS._Y03._MIN, IMIN)
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM1._CRS._Y03._MAX, IMAX)
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM1._CRS._Y04._INT, IRQ0)
+ IENF ()
+ Store (0x04, ILDN)
+ Store (IIOH, Local0)
+ ShiftLeft (Local0, 0x08, Local1)
+ Store (IIOL, Local0)
+ Add (Local1, Local0, Local0)
+ Store (Local0, IMIN)
+ Store (Local0, IMAX)
+ Store (IINT, Local0)
+ IEXF ()
+ Store (0x01, Local1)
+ ShiftLeft (Local1, Local0, IRQ0)
+ Return (BFU1)
+ }
+
+ Name (_PRS, ResourceTemplate ()
+ {
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,
+ 0x03F8, // Range Minimum
+ 0x03F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {5}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,
+ 0x02F8, // Range Minimum
+ 0x02F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {9}
+ }
+ EndDependentFn ()
+ })
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateByteField (Arg0, 0x02, IOLO)
+ CreateByteField (Arg0, 0x03, IOHI)
+ CreateWordField (Arg0, 0x09, IRQ0)
+ IENF ()
+ Store (0x04, ILDN)
+ Store (Zero, IACT)
+ Store (IOLO, IIOL)
+ Store (IOHI, IIOH)
+ FindSetRightBit (IRQ0, Local0)
+ If (LGreater (Local0, 0x00))
+ {
+ Decrement (Local0)
+ }
+
+ Store (Local0, IINT)
+ Store (One, IACT)
+ IEXF ()
+ }
+ } /* COM1 */
+
+ Device (COM2)
+ {
+ Name (_UID, 0x04)
+ Name (_HID, EisaId ("PNP0501"))
+ Method (_STA, 0, NotSerialized)
+ {
+ IENF ()
+ Store (0x05, ILDN)
+ Store (IACT, Local0)
+ IEXF ()
+ If (LEqual (Local0, 0xFF))
+ {
+ Return (0x00)
+ }
+
+ If (LEqual (Local0, One))
+ {
+ Return (0x0F)
+ }
+ Else
+ {
+ Return (0x0D)
+ }
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ IENF ()
+ Store (0x05, ILDN)
+ Store (Zero, IACT)
+ IEXF ()
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BFU1, ResourceTemplate ()
+ {
+ IO (Decode16,
+ 0x03F8, // Range Minimum
+ 0x03F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ _Y05)
+ IRQNoFlags (_Y06)
+ {9}
+ })
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM2._CRS._Y05._MIN, IMIN)
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM2._CRS._Y05._MAX, IMAX)
+ CreateWordField (BFU1, \_SB.PCI0.ISA.SIO.COM2._CRS._Y06._INT, IRQ0)
+ IENF ()
+ Store (0x05, ILDN)
+ Store (IIOH, Local0)
+ ShiftLeft (Local0, 0x08, Local1)
+ Store (IIOL, Local0)
+ Add (Local1, Local0, Local0)
+ Store (Local0, IMIN)
+ Store (Local0, IMAX)
+ Store (IINT, Local0)
+ IEXF ()
+ Store (0x01, Local1)
+ ShiftLeft (Local1, Local0, IRQ0)
+ Return (BFU1)
+ }
+
+ Name (_PRS, ResourceTemplate ()
+ {
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,
+ 0x03F8, // Range Minimum
+ 0x03F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {5}
+ }
+ StartDependentFnNoPri ()
+ {
+ IO (Decode16,
+ 0x02F8, // Range Minimum
+ 0x02F8, // Range Maximum
+ 0x08, // Alignment
+ 0x08, // Length
+ )
+ IRQNoFlags ()
+ {9}
+ }
+ EndDependentFn ()
+ })
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateByteField (Arg0, 0x02, IOLO)
+ CreateByteField (Arg0, 0x03, IOHI)
+ CreateWordField (Arg0, 0x09, IRQ0)
+ IENF ()
+ Store (0x05, ILDN)
+ Store (Zero, IACT)
+ Store (IOLO, IIOL)
+ Store (IOHI, IIOH)
+ FindSetRightBit (IRQ0, Local0)
+ If (LGreater (Local0, 0x00))
+ {
+ Decrement (Local0)
+ }
+
+ Store (Local0, IINT)
+ Store (One, IACT)
+ IEXF ()
+ }
+ } /* COM2 */
+ } /* Device SIO */
+ } /* Device ISA */
+ } /* Device PCI 0*/
+ } /* Scope SB */
+
+ OperationRegion (_SB.PCI0.ISA.PIX0, PCI_Config, 0x60, 0x0C)
+ Field (\_SB.PCI0.ISA.PIX0, ByteAcc, NoLock, Preserve)
+ {
+ PIRA, 8,
+ PIRB, 8,
+ PIRC, 8,
+ PIRD, 8,
+ Offset (0x08),
+ PIRE, 8,
+ PIRF, 8,
+ PIRG, 8,
+ PIRH, 8
+ }
+
+ Scope (_SB)
+ {
+ Name (BUFA, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, _Y1C)
+ {15}
+ })
+ CreateWordField (BUFA, \_SB._Y1C._INT, IRA0)
+ Device (LNKA)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x01)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRA, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSA)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRA, 0x80, PIRA)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRA, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRA)
+ }
+ }
+
+ Device (LNKB)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x02)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRB, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSB)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRB, 0x80, PIRB)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRB, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRB)
+ }
+ }
+
+ Device (LNKC)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x03)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRC, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSC)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRC, 0x80, PIRC)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRC, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRC)
+ }
+ }
+
+ Device (LNKD)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x04)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRD, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSD)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRD, 0x80, PIRD)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRD, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRD)
+ }
+ }
+
+ Device (LNKE)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x05)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRE, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSE)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRE, 0x80, PIRE)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRE, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRE)
+ }
+ }
+
+ Device (LNKF)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x06)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRF, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSF)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRF, 0x80, PIRF)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRF, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRF)
+ }
+ }
+
+ Device (LNKG)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x07)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRG, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSG)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRG, 0x80, PIRG)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRG, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRG)
+ }
+ }
+
+ Device (LNKH)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x08)
+ Method (_STA, 0, NotSerialized)
+ {
+ And (PIRH, 0x80, Local0)
+ If (Local0)
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Return (PRSH)
+ }
+
+ Method (_DIS, 0, NotSerialized)
+ {
+ Or (PIRH, 0x80, PIRH)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ And (PIRH, 0x0F, Local0)
+ ShiftLeft (0x01, Local0, IRA0)
+ Return (BUFA)
+ }
+
+ Method (_SRS, 1, NotSerialized)
+ {
+ CreateWordField (Arg0, 0x01, IRA)
+ FindSetRightBit (IRA, Local0)
+ Decrement (Local0)
+ Store (Local0, PIRH)
+ }
+ }
+ }
+}
+
+
Modified: trunk/src/mainboard/iwill/dk8_htx/Makefile.inc
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -26,15 +26,13 @@
obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
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-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.
initobj-y += crt0.o
@@ -54,33 +52,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/dsdt_lb.dsl
- 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)/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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/amd8111.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -89,9 +89,9 @@
}
}
- Include ("amd8111_pic.asl")
+ #include "amd8111_pic.asl"
- Include ("amd8111_isa.asl")
+ #include "amd8111_isa.asl"
Device (TP2P)
{
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -170,7 +170,7 @@
IRQNoFlags () {1}
})
}
- Include ("superio.asl")
+ #include "superio.asl"
}
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1,2 +1,2 @@
- Include ("amd8111.asl") //real SB at first
- Include ("amd8131.asl")
+ #include "amd8111.asl" //real SB at first
+ #include "amd8131.asl"
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8132_2.asl")
+ #include "amd8132_2.asl"
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8151.asl")
+ #include "amd8151.asl"
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("amd8131_2.asl")
+ #include "amd8131_2.asl"
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
- Include ("htx_no_ioapic.asl")
+ #include "htx_no_ioapic.asl"
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi/superio.asl
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/superio.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi/superio.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -1 +1 @@
-// Include ("w83627hf.asl")
+// #include "w83627hf.asl"
Copied and modified: trunk/src/mainboard/iwill/dk8_htx/dsdt.asl (from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl)
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/iwill/dk8_htx/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -103,7 +103,7 @@
Return (Local3)
}
- Include ("pci0_hc.asl")
+ #include "acpi/pci0_hc.asl"
}
Device (PCI1)
@@ -206,7 +206,7 @@
Z00A, 8
}
- Include ("../../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
}
Copied and modified: trunk/src/mainboard/iwill/dk8_htx/ssdt2.asl (from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci2.asl)
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci2.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/iwill/dk8_htx/ssdt2.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci2_hc.asl")
+ #include "acpi/pci2_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/iwill/dk8_htx/ssdt3.asl (from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci3.asl)
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci3.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/iwill/dk8_htx/ssdt3.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci3_hc.asl")
+ #include "acpi/pci3_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/iwill/dk8_htx/ssdt4.asl (from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci4.asl)
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci4.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/iwill/dk8_htx/ssdt4.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci4_hc.asl")
+ #include "acpi/pci4_hc.asl"
}
}
Copied and modified: trunk/src/mainboard/iwill/dk8_htx/ssdt5.asl (from r5093, trunk/src/mainboard/iwill/dk8_htx/dx/pci5.asl)
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/dx/pci5.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/iwill/dk8_htx/ssdt5.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -60,7 +60,7 @@
Return (Local3)
}
- Include ("pci5_hc.asl")
+ #include "acpi/pci5_hc.asl"
}
}
Modified: trunk/src/mainboard/kontron/986lcd-m/Makefile.inc
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/986lcd-m/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -47,14 +47,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/kontron/kt690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/kontron/kt690/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/kontron/kt690/acpi/debug.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/debug.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/debug.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001
)
{
- Include ("debug.asl")
+ #include "debug.asl"
}
*/
Modified: trunk/src/mainboard/kontron/kt690/acpi/globutil.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/globutil.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/globutil.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -19,7 +19,7 @@
/*
Scope(\_SB) {
- Include ("globutil.asl")
+ #include "globutil.asl"
}
*/
Modified: trunk/src/mainboard/kontron/kt690/acpi/ide.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/ide.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/ide.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
Device(PCI0) {
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "ide.asl"
}
}
}
Modified: trunk/src/mainboard/kontron/kt690/acpi/routing.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/routing.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/routing.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -21,7 +21,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("routing.asl")
+ #include "routing.asl"
}
*/
Modified: trunk/src/mainboard/kontron/kt690/acpi/sata.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/sata.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/sata.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -24,7 +24,7 @@
Device(PCI0) {
Device(SATA) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "sata.asl"
}
}
}
Modified: trunk/src/mainboard/kontron/kt690/acpi/usb.asl
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/usb.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/kontron/kt690/acpi/usb.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("usb.asl")
+ #include "usb.asl"
}
*/
Method(UCOC, 0) {
Copied and modified: trunk/src/mainboard/kontron/kt690/dsdt.asl (from r5093, trunk/src/mainboard/kontron/kt690/acpi/dsdt.asl)
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/kontron/kt690/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001 /* OEM Revision */
)
{ /* Start of ASL file */
- /* Include ("debug.asl") */ /* Include global debug methods if needed */
+ /* #include "acpi/debug.asl" */ /* Include global debug methods if needed */
/* Data to be patched by the BIOS during POST */
/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@
}
}
- Include ("routing.asl")
+ #include "acpi/routing.asl"
Scope(\_SB) {
@@ -1119,11 +1119,11 @@
} /* End Scope GPE */
- Include ("usb.asl")
+ #include "acpi/usb.asl"
/* South Bridge */
Scope(\_SB) { /* Start \_SB scope */
- Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+ #include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
/* _SB.PCI0 */
/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@
/* Describe the Southbridge devices */
Device(STCR) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "acpi/sata.asl"
} /* end STCR */
Device(UOH1) {
@@ -1262,7 +1262,7 @@
/* Primary (and only) IDE channel */
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "acpi/ide.asl"
} /* end IDEC */
Device(AZHD) {
Modified: trunk/src/mainboard/msi/ms7260/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms7260/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/msi/ms7260/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
Modified: trunk/src/mainboard/msi/ms9282/Makefile.inc
==============================================================================
--- trunk/src/mainboard/msi/ms9282/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/msi/ms9282/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -50,13 +50,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
Modified: trunk/src/mainboard/roda/rk886ex/Makefile.inc
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/roda/rk886ex/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -55,14 +55,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/supermicro/h8dme/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dme/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/supermicro/h8dme/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,28 +48,6 @@
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 $@
-
-$(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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/supermicro/h8dmr/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/supermicro/h8dmr/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -47,28 +47,6 @@
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 $@
-
-$(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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/supermicro/h8dmr_fam10/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -40,28 +40,6 @@
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 $@
-
-$(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 $(obj)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
- perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
- mv $(obj)/pci2.hex $(obj)/ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
- iasl -p $(obj)/pci3 -tc $(CONFIG_MAINBOARD)/
- perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
- mv $(obj)/pci3.hex $(obj)/ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
- iasl -p $(obj)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
- perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
- mv $(obj)/pci4.hex $(obj)/ssdt4.c
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/supermicro/h8qme_fam10/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -40,28 +40,6 @@
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 $@
-
-$(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 $(obj)/pci2 -tc $(CONFIG_MAINBOARD)/dx/pci2.asl
- perl -pi -e 's/AmlCode/AmlCode_ssdt2/g' $(obj)/pci2.hex
- mv $(obj)/pci2.hex $(obj)/ssdt2.c
-
-$(obj)/ssdt3.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci3.asl"
- iasl -p $(obj)/pci3 -tc $(CONFIG_MAINBOARD)/
- perl -pi -e 's/AmlCode/AmlCode_ssdt3/g' $(obj)/pci3.hex
- mv $(obj)/pci3.hex $(obj)/ssdt3.c
-
-$(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl"
- iasl -p $(obj)/pci4 -tc $(CONFIG_MAINBOARD)/dx/pci4.asl
- perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' $(obj)/pci4.hex
- mv $(obj)/pci4.hex $(obj)/ssdt4.c
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/technexion/tim5690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -54,13 +54,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/technexion/tim5690/acpi/debug.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/debug.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/debug.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001
)
{
- Include ("debug.asl")
+ #include "debug.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim5690/acpi/globutil.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/globutil.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/globutil.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -19,7 +19,7 @@
/*
Scope(\_SB) {
- Include ("globutil.asl")
+ #include "globutil.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim5690/acpi/ide.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/ide.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/ide.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
Device(PCI0) {
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "ide.asl"
}
}
}
Modified: trunk/src/mainboard/technexion/tim5690/acpi/routing.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/routing.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/routing.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -21,7 +21,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("routing.asl")
+ #include "routing.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim5690/acpi/sata.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/sata.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/sata.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -24,7 +24,7 @@
Device(PCI0) {
Device(SATA) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "sata.asl"
}
}
}
Modified: trunk/src/mainboard/technexion/tim5690/acpi/usb.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/usb.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim5690/acpi/usb.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("usb.asl")
+ #include "usb.asl"
}
*/
Method(UCOC, 0) {
Copied and modified: trunk/src/mainboard/technexion/tim5690/dsdt.asl (from r5093, trunk/src/mainboard/technexion/tim5690/acpi/dsdt.asl)
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/technexion/tim5690/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001 /* OEM Revision */
)
{ /* Start of ASL file */
- /* Include ("debug.asl") */ /* Include global debug methods if needed */
+ /* #include "acpi/debug.asl" */ /* Include global debug methods if needed */
/* Data to be patched by the BIOS during POST */
/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@
}
}
- Include ("routing.asl")
+ #include "acpi/routing.asl"
Scope(\_SB) {
@@ -1119,11 +1119,11 @@
} /* End Scope GPE */
- Include ("usb.asl")
+ #include "acpi/usb.asl"
/* South Bridge */
Scope(\_SB) { /* Start \_SB scope */
- Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+ #include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
/* _SB.PCI0 */
/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@
/* Describe the Southbridge devices */
Device(STCR) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "acpi/sata.asl"
} /* end STCR */
Device(UOH1) {
@@ -1262,7 +1262,7 @@
/* Primary (and only) IDE channel */
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "acpi/ide.asl"
} /* end IDEC */
Device(AZHD) {
Modified: trunk/src/mainboard/technexion/tim8690/Makefile.inc
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -48,13 +48,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/acpi/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/technexion/tim8690/acpi/debug.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/debug.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/debug.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001
)
{
- Include ("debug.asl")
+ #include "debug.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim8690/acpi/globutil.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/globutil.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/globutil.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -19,7 +19,7 @@
/*
Scope(\_SB) {
- Include ("globutil.asl")
+ #include "globutil.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim8690/acpi/ide.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/ide.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/ide.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
Device(PCI0) {
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "ide.asl"
}
}
}
Modified: trunk/src/mainboard/technexion/tim8690/acpi/routing.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/routing.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/routing.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -21,7 +21,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("routing.asl")
+ #include "routing.asl"
}
*/
Modified: trunk/src/mainboard/technexion/tim8690/acpi/sata.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/sata.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/sata.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -24,7 +24,7 @@
Device(PCI0) {
Device(SATA) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "sata.asl"
}
}
}
Modified: trunk/src/mainboard/technexion/tim8690/acpi/usb.asl
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/usb.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/technexion/tim8690/acpi/usb.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001
)
{
- Include ("usb.asl")
+ #include "usb.asl"
}
*/
Method(UCOC, 0) {
Copied and modified: trunk/src/mainboard/technexion/tim8690/dsdt.asl (from r5093, trunk/src/mainboard/technexion/tim8690/acpi/dsdt.asl)
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/technexion/tim8690/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -27,7 +27,7 @@
0x00010001 /* OEM Revision */
)
{ /* Start of ASL file */
- /* Include ("debug.asl") */ /* Include global debug methods if needed */
+ /* #include "acpi/debug.asl" */ /* Include global debug methods if needed */
/* Data to be patched by the BIOS during POST */
/* FIXME the patching is not done yet! */
@@ -370,7 +370,7 @@
}
}
- Include ("routing.asl")
+ #include "acpi/routing.asl"
Scope(\_SB) {
@@ -1119,11 +1119,11 @@
} /* End Scope GPE */
- Include ("usb.asl")
+ #include "acpi/usb.asl"
/* South Bridge */
Scope(\_SB) { /* Start \_SB scope */
- Include ("globutil.asl") /* global utility methods expected within the \_SB scope */
+ #include "acpi/globutil.asl" /* global utility methods expected within the \_SB scope */
/* _SB.PCI0 */
/* Note: Only need HID on Primary Bus */
@@ -1222,7 +1222,7 @@
/* Describe the Southbridge devices */
Device(STCR) {
Name(_ADR, 0x00120000)
- Include ("sata.asl")
+ #include "acpi/sata.asl"
} /* end STCR */
Device(UOH1) {
@@ -1262,7 +1262,7 @@
/* Primary (and only) IDE channel */
Device(IDEC) {
Name(_ADR, 0x00140001)
- Include ("ide.asl")
+ #include "acpi/ide.asl"
} /* end IDEC */
Device(AZHD) {
Modified: trunk/src/mainboard/tyan/s2735/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2735/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/tyan/s2735/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -51,13 +51,6 @@
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.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Copied and modified: trunk/src/mainboard/tyan/s2891/dsdt.asl (from r5093, trunk/src/mainboard/tyan/s2891/dsdt.dsl)
==============================================================================
--- trunk/src/mainboard/tyan/s2891/dsdt.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/tyan/s2891/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE ", "CB-DSDT ", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
Copied and modified: trunk/src/mainboard/tyan/s2892/dsdt.asl (from r5093, trunk/src/mainboard/tyan/s2892/dsdt.dsl)
==============================================================================
--- trunk/src/mainboard/tyan/s2892/dsdt.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/tyan/s2892/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE ", "CB-DSDT ", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
Copied and modified: trunk/src/mainboard/tyan/s2895/dsdt.asl (from r5093, trunk/src/mainboard/tyan/s2895/dsdt.dsl)
==============================================================================
--- trunk/src/mainboard/tyan/s2895/dsdt.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/tyan/s2895/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -22,7 +22,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE ", "CB-DSDT ", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
Modified: trunk/src/mainboard/tyan/s2912/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/tyan/s2912/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -50,13 +50,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
Modified: trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/tyan/s2912_fam10/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -43,13 +43,6 @@
ifdef POST_EVALUATION
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p $(obj)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- 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)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c -o $@
Modified: trunk/src/mainboard/via/epia-m/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia-m/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/via/epia-m/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -46,13 +46,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/via/epia-n/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia-n/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/via/epia-n/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -43,13 +43,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Copied: trunk/src/mainboard/via/epia-n/acpi/irq_links.asl (from r5093, trunk/src/mainboard/via/epia-n/irq_links.asl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/via/epia-n/acpi/irq_links.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/via/epia-n/irq_links.asl)
@@ -0,0 +1,571 @@
+/*
+ * Minimalist ACPI DSDT table for EPIA-N / NL
+ * Basic description of PCI Interrupt Assignments.
+ * This is expected to be included into _SB.PCI0 namespace
+ * (C) Copyright 2009 Jon Harrison <jon.harrison at blueyonder.co.uk>
+ *
+ */
+
+ /* PCI PnP Routing Links */
+
+ /* Define how interrupt Link A is plumbed in */
+ Device (LNKA)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x01)
+ /* Status - always return ready */
+ Method (_STA, 0, NotSerialized)
+ {
+ /* See If Coreboot has allocated INTA# */
+ And (PIRA, 0xF0, Local0)
+ If (LEqual (Local0, 0x00))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (BUFA, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, )
+ {3,4,6,7,10,11,12}
+ })
+ Return (BUFA)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BUFA, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, _Y07)
+ {}
+ })
+ /* Read the Binary Encoded Field and Map this */
+ /* onto the bitwise _INT field in the IRQ descriptor */
+ /* See ACPI Spec for detail of _IRQ Descriptor */
+ CreateByteField (BUFA, \_SB.PCI0.LNKA._CRS._Y07._INT, IRA1)
+ CreateByteField (BUFA, 0x02, IRA2)
+ Store (0x00, Local3)
+ Store (0x00, Local4)
+ And (PIRA, 0xF0, Local1)
+ ShiftRight (Local1, 0x04, Local1)
+ If (LNotEqual (Local1, 0x00))
+ {
+ If (LGreater (Local1, 0x07))
+ {
+ Subtract (Local1, 0x08, Local2)
+ ShiftLeft (One, Local2, Local4)
+ }
+ Else
+ {
+ If (LGreater (Local1, 0x00))
+ {
+ ShiftLeft (One, Local1, Local3)
+ }
+ }
+
+ Store (Local3, IRA1)
+ Store (Local4, IRA2)
+ }
+ Return (BUFA)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - Set PnP Routing Reg to 0 */
+ Method (_DIS, 0, NotSerialized )
+ {
+ And (PIRA, 0x0F, PIRA)
+ }
+ } // End of LNKA
+
+ Device (LNKB)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x02)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* See If Coreboot has allocated INTB# */
+ And (PIBC, 0x0F, Local0)
+ If (LEqual (Local0, 0x00))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (BUFB, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, )
+ {3,4,6,7,10,11,12}
+ })
+ Return (BUFB)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BUFB, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, _Y08)
+ {}
+ })
+ /* Read the Binary Encoded Field and Map this */
+ /* onto the bitwise _INT field in the IRQ descriptor */
+ /* See ACPI Spec for detail of _IRQ Descriptor */
+ CreateByteField (BUFB, \_SB.PCI0.LNKB._CRS._Y08._INT, IRB1)
+ CreateByteField (BUFB, 0x02, IRB2)
+ Store (0x00, Local3)
+ Store (0x00, Local4)
+ And (PIBC, 0x0F, Local1)
+ If (LNotEqual (Local1, 0x00))
+ {
+ If (LGreater (Local1, 0x07))
+ {
+ Subtract (Local1, 0x08, Local2)
+ ShiftLeft (One, Local2, Local4)
+ }
+ Else
+ {
+ If (LGreater (Local1, 0x00))
+ {
+ ShiftLeft (One, Local1, Local3)
+ }
+ }
+
+ Store (Local3, IRB1)
+ Store (Local4, IRB2)
+ }
+ Return (BUFB)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - Set PnP Routing Reg to 0 */
+ Method (_DIS, 0, NotSerialized )
+ {
+ And (PIBC, 0xF0, PIBC)
+ }
+
+ } // End of LNKB
+
+ Device (LNKC)
+ {
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x03)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* See If Coreboot has allocated INTC# */
+ And (PIBC, 0xF0, Local0)
+ If (LEqual (Local0, 0x00))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (BUFC, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, )
+ {3,4,6,7,10,11,12}
+ })
+ Return (BUFC)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BUFC, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, _Y09)
+ {}
+ })
+ /* Read the Binary Encoded Field and Map this */
+ /* onto the bitwise _INT field in the IRQ descriptor */
+ /* See ACPI Spec for detail of _IRQ Descriptor */
+ CreateByteField (BUFC, \_SB.PCI0.LNKC._CRS._Y09._INT, IRC1)
+ CreateByteField (BUFC, 0x02, IRC2)
+ Store (0x00, Local3)
+ Store (0x00, Local4)
+ And (PIBC, 0xF0, Local1)
+ ShiftRight (Local1, 0x04, Local1)
+ If (LNotEqual (Local1, 0x00))
+ {
+ If (LGreater (Local1, 0x07))
+ {
+ Subtract (Local1, 0x08, Local2)
+ ShiftLeft (One, Local2, Local4)
+ }
+ Else
+ {
+ If (LGreater (Local1, 0x00))
+ {
+ ShiftLeft (One, Local1, Local3)
+ }
+ }
+
+ Store (Local3, IRC1)
+ Store (Local4, IRC2)
+ }
+ Return (BUFC)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - Set PnP Routing Reg to 0 */
+ Method (_DIS, 0, NotSerialized )
+ {
+ And (PIBC, 0x0F, PIBC)
+ }
+
+} // End of LNKC
+
+Device (LNKD)
+{
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x04)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* See If Coreboot has allocated INTD# */
+ And (PIRD, 0xF0, Local0)
+ If (LEqual (Local0, 0x00))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (BUFD, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, )
+ {3,4,6,7,10,11,12}
+ })
+ Return (BUFD)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (BUFD, ResourceTemplate ()
+ {
+ IRQ (Level, ActiveLow, Shared, _Y0A)
+ {}
+ })
+ /* Read the Binary Encoded Field and Map this */
+ /* onto the bitwise _INT field in the IRQ descriptor */
+ /* See ACPI Spec for detail of _IRQ Descriptor */
+ CreateByteField (BUFD, \_SB.PCI0.LNKD._CRS._Y0A._INT, IRD1)
+ CreateByteField (BUFD, 0x02, IRD2)
+ Store (0x00, Local3)
+ Store (0x00, Local4)
+ And (PIRD, 0xF0, Local1)
+ ShiftRight (Local1, 0x04, Local1)
+ If (LNotEqual (Local1, 0x00))
+ {
+ If (LGreater (Local1, 0x07))
+ {
+ Subtract (Local1, 0x08, Local2)
+ ShiftLeft (One, Local2, Local4)
+ }
+ Else
+ {
+ If (LGreater (Local1, 0x00))
+ {
+ ShiftLeft (One, Local1, Local3)
+ }
+ }
+
+ Store (Local3, IRD1)
+ Store (Local4, IRD2)
+ }
+ Return (BUFD)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - Set PnP Routing Reg to 0 */
+ Method (_DIS, 0, NotSerialized )
+ {
+ And (PIRD, 0x0F, PIRD)
+ }
+
+} // End of LNKD
+
+
+/* APIC IRQ Links */
+
+Device (ATAI)
+{
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x05)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* ATFL == 0x02 if SATA Enabled */
+ If (LNotEqual (ATFL, 0x02))
+ {
+ /* Double Check By Reading SATA VID */
+ /* Otherwise Compatibility Mode */
+ If (LNotEqual (\_SB.PCI0.SATA.VID, 0x1106))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+ Else
+ {
+ /* Serial ATA Enabled Check if PATA is in */
+ /* Compatibility Mode */
+ If (LEqual (\_SB.PCI0.PATA.ENAT, 0x0A))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (ATAN, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, )
+ {
+ 0x00000014,
+ }
+ })
+ Return (ATAN)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (ATAB, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, _Y10)
+ {
+ 0x00000000,
+ }
+ })
+ CreateByteField (ATAB, \_SB.PCI0.ATAI._CRS._Y10._INT, IRAI)
+ Store (0x14, IRAI)
+ Return (ATAB)
+
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - dummy function to keep Linux ACPI happy */
+ Method (_DIS, 0, NotSerialized ) {}
+
+} // End of ATA Interface Link
+
+
+Device (USBI)
+{
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x0A)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* Check that at least one of the USB */
+ /* functions is enabled */
+ And (IDEB, 0x37, Local0)
+ If (LEqual (Local0, 0x37))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (USBB, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, )
+ {
+ 0x00000015,
+ }
+ })
+
+ Return(USBB)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (USBB, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, _Y12)
+ {
+ 0x00000000,
+ }
+ })
+ CreateByteField (USBB, \_SB.PCI0.USBI._CRS._Y12._INT, IRBI)
+ Store (0x15, IRBI)
+ Return (USBB)
+ }
+
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - dummy function to keep Linux ACPI happy */
+ Method (_DIS, 0, NotSerialized ) {}
+}
+
+Device (VT8I)
+{
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x0B)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* Check Whether Sound and/or Modem are Activated */
+ If (LEqual (EAMC, 0x03))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (A97C, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, )
+ {
+ 0x00000016,
+ }
+ })
+ Return (A97C)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (A97B, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, _Y14)
+ {
+ 0x00000000,
+ }
+ })
+ CreateByteField (A97B, \_SB.PCI0.VT8I._CRS._Y14._INT, IRCI)
+ Store (0x16, IRCI)
+ Return (A97B)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - dummy function to keep Linux ACPI happy */
+ Method (_DIS, 0, NotSerialized ) {}
+
+}
+
+
+Device (NICI)
+{
+ Name (_HID, EisaId ("PNP0C0F"))
+ Name (_UID, 0x0C)
+ Method (_STA, 0, NotSerialized)
+ {
+ /* Check if LAN Function is Enabled */
+ /* Note that LAN Enable Polarity is different */
+ /* from other functions in VT8237R !? */
+ If (LEqual (ELAN, 0x00))
+ {
+ Return (0x09)
+ }
+ Else
+ {
+ Return (0x0B)
+ }
+ }
+
+ Method (_PRS, 0, NotSerialized)
+ {
+ Name (NICB, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, )
+ {
+ 0x00000017,
+ }
+ })
+ Return (NICB)
+ }
+
+ Method (_CRS, 0, NotSerialized)
+ {
+ Name (NICD, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveLow, Shared, ,, _Y16)
+ {
+ 0x00000000,
+ }
+ })
+ CreateByteField (NICD, \_SB.PCI0.NICI._CRS._Y16._INT, IRDI)
+ Store (0x17, IRDI)
+ Return (NICD)
+ }
+
+ /* Set Resources - dummy function to keep Linux ACPI happy
+ * Linux is more than happy not to tinker with irq
+ * assignments as long as the CRS and STA functions
+ * return good values
+ */
+ Method (_SRS, 1, NotSerialized) {}
+ /* Disable - dummy function to keep Linux ACPI happy */
+ Method (_DIS, 0, NotSerialized ) {}
+
+
+}
Copied: trunk/src/mainboard/via/epia-n/acpi/pata_methods.asl (from r5093, trunk/src/mainboard/via/epia-n/pata_methods.asl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/via/epia-n/acpi/pata_methods.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/via/epia-n/pata_methods.asl)
@@ -0,0 +1,132 @@
+/*
+ * Minimalist ACPI DSDT table for EPIA-N / NL
+ * Basic description of some hardware resources to allow
+ * interrupt assignments to be done. This is expected to be included
+ * into the PATA Device definition in ab_physical.asl
+ * (C) Copyright 2009 Jon Harrison <jon.harrison at blueyonder.co.uk>
+ *
+ */
+
+Name (TIM0, Package (0x07)
+{
+ Package (0x05)
+ {
+ 0x78, 0xB4, 0xF0, 0x017F, 0x0258
+ },
+
+ Package (0x05)
+ {
+ 0x20, 0x22, 0x33, 0x47, 0x5D
+ },
+
+ Package (0x05)
+ {
+ 0x04, 0x03, 0x02, 0x01, 0x00
+ },
+
+ Package (0x04)
+ {
+ 0x02, 0x01, 0x00, 0x00
+ },
+
+ Package (0x07)
+ {
+ 0x78, 0x50, 0x3C, 0x2D, 0x1E, 0x14, 0x0F
+ },
+
+ Package (0x0F)
+ {
+ 0x06, 0x05, 0x04, 0x04, 0x03, 0x03, 0x02, 0x02,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,0x00
+ },
+
+ Package (0x07)
+ {
+ 0x0E, 0x08, 0x06, 0x04, 0x02, 0x01, 0x00
+ }
+})
+
+
+/* This method sets up the PATA Timing Control*/
+/* Note that a lot of this is done in the */
+/* Coreboot VT8237R Init code, but this is */
+/* already getting very cluttered with board */
+/* specific code. Using ACPI will allow this */
+/* to be de-cluttered a bit (so long as we're */
+/* running a ACPI Capable OS !!!) */
+
+Method (PMEX, 0, Serialized)
+{
+ If (REGF)
+ {
+ /* Check if these regs are still at defaults */
+ /* Board specific timing improvement if not */
+ /* Already changed */
+ If (LEqual (PMPT, 0xA8))
+ {
+ Store (0x5D, PMPT)
+ }
+
+ If (LEqual (PSPT, 0xA8))
+ {
+ Store (0x5D, PSPT)
+ }
+
+ If (LEqual (SMPT, 0xA8))
+ {
+ Store (0x5D, SMPT)
+ }
+
+ If (LEqual (SSPT, 0xA8))
+ {
+ Store (0x5D, SSPT)
+ }
+
+ }
+}
+
+/* This Method Provides the method that is used to */
+/* Reset ATA Drives to POST reset condition */
+Method (GTF, 4, Serialized)
+{
+ Store (Buffer (0x07)
+ {
+ 0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+ }, Local1)
+ Store (Buffer (0x07)
+ {
+ 0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+ }, Local2)
+ CreateByteField (Local1, 0x01, MODE)
+ CreateByteField (Local2, 0x01, UMOD)
+ CreateByteField (Local1, 0x05, PCHA)
+ CreateByteField (Local2, 0x05, UCHA)
+ And (Arg0, 0x03, Local3)
+ If (LEqual (And (Local3, 0x01), 0x01))
+ {
+ Store (0xB0, PCHA)
+ Store (0xB0, UCHA)
+ }
+
+ If (Arg1)
+ {
+ Store (DerefOf (Index (DerefOf (Index (TIM0, 0x05)), Arg2)),
+ UMOD)
+ Or (UMOD, 0x40, UMOD)
+ }
+ Else
+ {
+ Store (Match (DerefOf (Index (TIM0, 0x01)), MEQ, Arg3, MTR,
+ 0x00, 0x00), Local0)
+ Or (0x20, DerefOf (Index (DerefOf (Index (TIM0, 0x03)), Local0
+ )), UMOD)
+ }
+
+ Store (Match (DerefOf (Index (TIM0, 0x01)), MEQ, Arg3, MTR,
+ 0x00, 0x00), Local0)
+ Or (0x08, DerefOf (Index (DerefOf (Index (TIM0, 0x02)), Local0
+ )), MODE)
+ Concatenate (Local1, Local2, Local6)
+ Return (Local6)
+}
+
Copied: trunk/src/mainboard/via/epia-n/acpi/pci_init.asl (from r5093, trunk/src/mainboard/via/epia-n/pci_init.asl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/via/epia-n/acpi/pci_init.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/via/epia-n/pci_init.asl)
@@ -0,0 +1,30 @@
+/*
+ * Minimalist ACPI DSDT table for EPIA-N / NL
+ * Basic description of PCI Interrupt Assignments.
+ * This is expected to be included into _SB.PCI0 namespace
+ * (C) Copyright 2009 Jon Harrison <jon.harrison at blueyonder.co.uk>
+ *
+ */
+
+/* This file provides a PCI Bus Initialisation Method that sets
+ * some flags for use in the interrupt link assignment
+ */
+
+Method (\_SB.PCI0._INI, 0, NotSerialized)
+{
+
+ /* Checking for ATA Interface Enabled */
+ Store (0x00, ATFL)
+ If (LEqual (EIDE, 0x01))
+ {
+ Store (0x02, ATFL)
+ }
+ Else
+ {
+ If (LNotEqual (\_SB.PCI0.PATA.VID, 0x1106))
+ {
+ Store (0x01, ATFL)
+ }
+ }
+
+}
Copied and modified: trunk/src/mainboard/via/epia-n/acpi/sb_physical.asl (from r5093, trunk/src/mainboard/via/epia-n/sb_physical.asl)
==============================================================================
--- trunk/src/mainboard/via/epia-n/sb_physical.asl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/via/epia-n/acpi/sb_physical.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -154,7 +154,7 @@
}
}
- Include("pata_methods.asl")
+ #include "pata_methods.asl"
OperationRegion (PAPR, PCI_Config, 0x00, 0xC2)
Modified: trunk/src/mainboard/via/epia-n/dsdt.asl
==============================================================================
--- trunk/src/mainboard/via/epia-n/dsdt.asl Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/via/epia-n/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -88,7 +88,7 @@
})
/* PCI Devices Included Here */
- Include("sb_physical.asl")
+ #include "acpi/sb_physical.asl"
/* Legacy PNP Devices Defined Here */
@@ -343,8 +343,8 @@
})
}
- Include("irq_links.asl")
- Include("pci_init.asl")
+ #include "acpi/irq_links.asl"
+ #include "acpi/pci_init.asl"
} //End of PCI0
Modified: trunk/src/mainboard/via/epia/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/epia/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/via/epia/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -39,13 +39,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
- $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
-
-$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
- mv dsdt.hex $@
-
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Modified: trunk/src/mainboard/via/vt8454c/Makefile.inc
==============================================================================
--- trunk/src/mainboard/via/vt8454c/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/mainboard/via/vt8454c/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -42,13 +42,6 @@
ifdef POST_EVALUATION
-$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
- iasl -p dsdt -tc $<
- mv 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)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/option_table.h
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/romstage.c -o $@
perl -e 's/\.rodata/.rom.data/g' -pi $@
Copied: trunk/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl (from r5093, trunk/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl)
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007-2009 coresystems GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+Name (PICM, Package () {
+ // _ADR PIN SRC IDX
+
+ Package () { 0x0003FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0003FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0003FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0003FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0004FFFF, 0x00, LNKB, 0x00 },
+ Package () { 0x0004FFFF, 0x01, LNKC, 0x00 },
+ Package () { 0x0004FFFF, 0x02, LNKD, 0x00 },
+ Package () { 0x0004FFFF, 0x03, LNKA, 0x00 },
+
+ Package () { 0x0005FFFF, 0x00, LNKC, 0x00 },
+ Package () { 0x0005FFFF, 0x01, LNKD, 0x00 },
+ Package () { 0x0005FFFF, 0x02, LNKA, 0x00 },
+ Package () { 0x0005FFFF, 0x03, LNKB, 0x00 },
+
+ Package () { 0x0006FFFF, 0x00, LNKD, 0x00 },
+ Package () { 0x0006FFFF, 0x01, LNKA, 0x00 },
+ Package () { 0x0006FFFF, 0x02, LNKB, 0x00 },
+ Package () { 0x0006FFFF, 0x03, LNKC, 0x00 },
+
+ Package () { 0x0007FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0007FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0007FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0007FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0008FFFF, 0x00, LNKB, 0x00 },
+ Package () { 0x0008FFFF, 0x01, LNKC, 0x00 },
+ Package () { 0x0008FFFF, 0x02, LNKD, 0x00 },
+ Package () { 0x0008FFFF, 0x03, LNKA, 0x00 },
+})
+
+Name (APIC, Package () {
+ Package () { 0x0003FFFF, 0x00, 0x00, 0x10 },
+ Package () { 0x0003FFFF, 0x01, 0x00, 0x11 },
+ Package () { 0x0003FFFF, 0x02, 0x00, 0x12 },
+ Package () { 0x0003FFFF, 0x03, 0x00, 0x13 },
+
+ Package () { 0x0004FFFF, 0x00, 0x00, 0x11 },
+ Package () { 0x0004FFFF, 0x01, 0x00, 0x12 },
+ Package () { 0x0004FFFF, 0x02, 0x00, 0x13 },
+ Package () { 0x0004FFFF, 0x03, 0x00, 0x10 },
+
+ Package () { 0x0005FFFF, 0x00, 0x00, 0x12 },
+ Package () { 0x0005FFFF, 0x01, 0x00, 0x13 },
+ Package () { 0x0005FFFF, 0x02, 0x00, 0x10 },
+ Package () { 0x0005FFFF, 0x03, 0x00, 0x11 },
+
+ Package () { 0x0006FFFF, 0x00, 0x00, 0x13 },
+ Package () { 0x0006FFFF, 0x01, 0x00, 0x10 },
+ Package () { 0x0006FFFF, 0x02, 0x00, 0x11 },
+ Package () { 0x0006FFFF, 0x03, 0x00, 0x12 },
+
+ Package () { 0x0007FFFF, 0x00, 0x00, 0x10 },
+ Package () { 0x0007FFFF, 0x01, 0x00, 0x11 },
+ Package () { 0x0007FFFF, 0x02, 0x00, 0x12 },
+ Package () { 0x0007FFFF, 0x03, 0x00, 0x13 },
+
+ Package () { 0x0008FFFF, 0x00, 0x00, 0x11 },
+ Package () { 0x0008FFFF, 0x01, 0x00, 0x12 },
+ Package () { 0x0008FFFF, 0x02, 0x00, 0x13 },
+ Package () { 0x0008FFFF, 0x03, 0x00, 0x10 },
+})
+
+
Copied: trunk/src/mainboard/via/vt8454c/acpi/irq.asl (from r5093, trunk/src/mainboard/via/vt8454c/irq.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/mainboard/via/vt8454c/acpi/irq.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/mainboard/via/vt8454c/irq.dsl)
@@ -0,0 +1,143 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007-2009 coresystems GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+Name (PICM, Package () {
+ // _ADR PIN SRC IDX
+
+ Package () { 0x0001FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0001FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0001FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0001FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0008FFFF, 0x00, LNKB, 0x00 },
+ Package () { 0x0008FFFF, 0x01, LNKC, 0x00 },
+ Package () { 0x0008FFFF, 0x02, LNKD, 0x00 },
+ Package () { 0x0008FFFF, 0x03, LNKA, 0x00 },
+
+ Package () { 0x0009FFFF, 0x00, LNKC, 0x00 },
+ Package () { 0x0009FFFF, 0x01, LNKD, 0x00 },
+ Package () { 0x0009FFFF, 0x02, LNKA, 0x00 },
+ Package () { 0x0009FFFF, 0x03, LNKB, 0x00 },
+
+ Package () { 0x000AFFFF, 0x00, LNKD, 0x00 },
+ Package () { 0x000AFFFF, 0x01, LNKA, 0x00 },
+ Package () { 0x000AFFFF, 0x02, LNKB, 0x00 },
+ Package () { 0x000AFFFF, 0x03, LNKC, 0x00 },
+
+ Package () { 0x000BFFFF, 0x00, LNKD, 0x00 },
+ Package () { 0x000BFFFF, 0x01, LNKA, 0x00 },
+ Package () { 0x000BFFFF, 0x02, LNKB, 0x00 },
+ Package () { 0x000BFFFF, 0x03, LNKC, 0x00 },
+
+ Package () { 0x000CFFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x000CFFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x000CFFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x000CFFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x000DFFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x000DFFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x000DFFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x000DFFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x000FFFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x000FFFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x000FFFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x000FFFFF, 0x03, LNKD, 0x00 },
+
+ /* USB controller */
+ Package () { 0x0010FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0010FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0010FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0010FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0011FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0011FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0011FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0011FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0012FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0012FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0012FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0012FFFF, 0x03, LNKD, 0x00 }
+})
+
+Name (APIC, Package () {
+ Package () { 0x0001FFFF, 0x00, 0x00, 0x10 },
+ Package () { 0x0001FFFF, 0x01, 0x00, 0x11 },
+ Package () { 0x0001FFFF, 0x02, 0x00, 0x12 },
+ Package () { 0x0001FFFF, 0x03, 0x00, 0x13 },
+
+ Package () { 0x0008FFFF, 0x00, 0x00, 0x11 },
+ Package () { 0x0008FFFF, 0x01, 0x00, 0x12 },
+ Package () { 0x0008FFFF, 0x02, 0x00, 0x13 },
+ Package () { 0x0008FFFF, 0x03, 0x00, 0x10 },
+
+ Package () { 0x0009FFFF, 0x00, 0x00, 0x12 },
+ Package () { 0x0009FFFF, 0x01, 0x00, 0x13 },
+ Package () { 0x0009FFFF, 0x02, 0x00, 0x10 },
+ Package () { 0x0009FFFF, 0x03, 0x00, 0x11 },
+
+ Package () { 0x000AFFFF, 0x00, 0x00, 0x13 },
+ Package () { 0x000AFFFF, 0x01, 0x00, 0x10 },
+ Package () { 0x000AFFFF, 0x02, 0x00, 0x11 },
+ Package () { 0x000AFFFF, 0x03, 0x00, 0x12 },
+
+ Package () { 0x000BFFFF, 0x00, 0x00, 0x13 },
+ Package () { 0x000BFFFF, 0x01, 0x00, 0x10 },
+ Package () { 0x000BFFFF, 0x02, 0x00, 0x11 },
+ Package () { 0x000BFFFF, 0x03, 0x00, 0x12 },
+
+ Package () { 0x000CFFFF, 0x00, 0x00, 0x10 },
+ Package () { 0x000CFFFF, 0x01, 0x00, 0x11 },
+ Package () { 0x000CFFFF, 0x02, 0x00, 0x12 },
+ Package () { 0x000CFFFF, 0x03, 0x00, 0x13 },
+
+ Package () { 0x000DFFFF, 0x00, 0x00, 0x10 },
+ Package () { 0x000DFFFF, 0x01, 0x00, 0x11 },
+ Package () { 0x000DFFFF, 0x02, 0x00, 0x12 },
+ Package () { 0x000DFFFF, 0x03, 0x00, 0x13 },
+
+ Package () { 0x000FFFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x000FFFFF, 0x01, LNKA, 0x00 },
+ Package () { 0x000FFFFF, 0x02, LNKA, 0x00 },
+ Package () { 0x000FFFFF, 0x03, LNKA, 0x00 },
+
+ /* USB controller. Hardwired in internal
+ APIC mode, see PM pg. 137,
+ "miscellaneous controls", footnote to
+ "IDE interrupt select" */
+ Package () { 0x0010FFFF, 0x00, 0x00, 0x14 },
+ Package () { 0x0010FFFF, 0x01, 0x00, 0x16 },
+ Package () { 0x0010FFFF, 0x02, 0x00, 0x15 },
+ Package () { 0x0010FFFF, 0x03, 0x00, 0x17 },
+
+ Package () { 0x0011FFFF, 0x00, LNKA, 0x00 },
+ Package () { 0x0011FFFF, 0x01, LNKB, 0x00 },
+ Package () { 0x0011FFFF, 0x02, LNKC, 0x00 },
+ Package () { 0x0011FFFF, 0x03, LNKD, 0x00 },
+
+ Package () { 0x0012FFFF, 0x00, LNKD, 0x00 },
+ Package () { 0x0012FFFF, 0x01, LNKD, 0x00 },
+ Package () { 0x0012FFFF, 0x02, LNKD, 0x00 },
+ Package () { 0x0012FFFF, 0x03, LNKD, 0x00 },
+})
+
+
Copied and modified: trunk/src/mainboard/via/vt8454c/dsdt.asl (from r5093, trunk/src/mainboard/via/vt8454c/dsdt.dsl)
==============================================================================
--- trunk/src/mainboard/via/vt8454c/dsdt.dsl Mon Feb 8 13:32:30 2010 (r5093, copy source)
+++ trunk/src/mainboard/via/vt8454c/dsdt.asl Mon Feb 8 16:46:37 2010 (r5094)
@@ -298,7 +298,7 @@
Name (_BBN, 0x00)
// Mainboard specific IRQ routing
- Include ("irq.dsl")
+ #include "acpi/irq.asl"
/* PCI Routing Table */
Method (_PRT, 0, NotSerialized)
@@ -317,7 +317,7 @@
{
Name (_ADR, 0x00130001)
- Include ("irq-p2p-bridge.dsl")
+ #include "acpi/irq-p2p-bridge.asl"
Method (_PRT, 0, NotSerialized)
{
If (LNot (PICF))
Modified: trunk/src/northbridge/amd/amdfam10/Makefile.inc
==============================================================================
--- trunk/src/northbridge/amd/amdfam10/Makefile.inc Mon Feb 8 13:32:30 2010 (r5093)
+++ trunk/src/northbridge/amd/amdfam10/Makefile.inc Mon Feb 8 16:46:37 2010 (r5094)
@@ -11,35 +11,3 @@
obj-y += get_pci1234.o
-ifdef POST_EVALUATION
-$(obj)/northbridge/amd/amdfam10/ssdt.c: $(src)/northbridge/amd/amdfam10/ssdt.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/ssdt -tc $<
- perl -pi -e 's/AmlCode/AmlCode_ssdt/g' $(obj)/northbridge/amd/amdfam10/ssdt.hex
- mv $(obj)/northbridge/amd/amdfam10/ssdt.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr1.c: $(src)/northbridge/amd/amdfam10/sspr1.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/sspr1 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_sspr1/g' $(obj)/northbridge/amd/amdfam10/sspr1.hex
- mv $(obj)/northbridge/amd/amdfam10/sspr1.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr2.c: $(src)/northbridge/amd/amdfam10/sspr2.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/sspr2 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_sspr2/g' $(obj)/northbridge/amd/amdfam10/sspr2.hex
- mv $(obj)/northbridge/amd/amdfam10/sspr2.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr3.c: $(src)/northbridge/amd/amdfam10/sspr3.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/sspr3 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_sspr3/g' $(obj)/northbridge/amd/amdfam10/sspr3.hex
- mv $(obj)/northbridge/amd/amdfam10/sspr3.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr4.c: $(src)/northbridge/amd/amdfam10/sspr4.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/sspr4 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_sspr4/g' $(obj)/northbridge/amd/amdfam10/sspr4.hex
- mv $(obj)/northbridge/amd/amdfam10/sspr4.hex $@
-
-$(obj)/northbridge/amd/amdfam10/sspr5.c: $(src)/northbridge/amd/amdfam10/sspr5.dsl
- iasl -p $(obj)/northbridge/amd/amdfam10/sspr5 -tc $<
- perl -pi -e 's/AmlCode/AmlCode_sspr5/g' $(obj)/northbridge/amd/amdfam10/sspr5.hex
- mv $(obj)/northbridge/amd/amdfam10/sspr5.hex $@
-endif
-
Copied: trunk/src/northbridge/amd/amdfam10/ssdt.asl (from r5093, trunk/src/northbridge/amd/amdfam10/ssdt.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/ssdt.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/ssdt.dsl)
@@ -0,0 +1,346 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/*
+ * Make sure HC_NUMS and HC_POSSIBLE_NUM setting is consistent to this file
+ */
+
+DefinitionBlock ("SSDT.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925440)
+{
+ /*
+ * These objects were referenced but not defined in this table
+ */
+ External (\_SB_.PCI0, DeviceObj)
+
+ Scope (\_SB.PCI0)
+ {
+ Name (BUSN, Package (0x20) /* HC_NUMS */
+ {
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x10101010,
+ 0x11111111,
+ 0x12121212,
+ 0x13131313,
+ 0x14141414,
+ 0x15151515,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc
+ })
+ Name (MMIO, Package (0x80) /* HC_NUMS * 4 */
+ {
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x11111111,
+ 0x22222222,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x11111111,
+ 0x22222222,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x11111111,
+ 0x22222222,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x11111111,
+ 0x22222222,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x11111111,
+ 0x22222222,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888
+ })
+ Name (PCIO, Package (0x40) /* HC_NUMS * 2 */
+ {
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0xaaaaaaaa,
+ 0xbbbbbbbb,
+ 0xcccccccc,
+ 0xdddddddd,
+ 0xeeeeeeee,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x99999999,
+ 0xaaaaaaaa,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444
+ })
+ Name (SBLK, 0x11)
+ Name (TOM1, 0xaaaaaaaa)
+ Name (SBDN, 0xbbbbbbbb)
+ Name (HCLK, Package (0x20) /* HC_POSSIBLE_NUM */
+ {
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888
+ })
+ Name (HCDN, Package (0x20) /* HC_POSSIBLE_NUM */
+ {
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888,
+ 0x11111111,
+ 0x22222222,
+ 0x33333333,
+ 0x44444444,
+ 0x55555555,
+ 0x66666666,
+ 0x77777777,
+ 0x88888888
+ })
+ Name (CBB, 0x99)
+ Name (CBST, 0x88)
+ Name (CBB2, 0x77)
+ Name (CBS2, 0x66)
+
+ }
+}
+
Copied: trunk/src/northbridge/amd/amdfam10/sspr1.asl (from r5093, trunk/src/northbridge/amd/amdfam10/sspr1.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/sspr1.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/sspr1.dsl)
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+DefinitionBlock ("SSPR.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925441)
+{
+ Scope (\_SB)
+ {
+ Processor (\_SB.CPAA, 0xbb, 0x120, 6) // CPU0 and 0x01 need to be updated
+ {
+ Name(_PCT, Package ()
+ {
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_CTRL
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_STATUS
+ })
+
+ Name(_PSS, Package()
+ {
+ Package(0x06) {0x1111, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ })
+ }
+
+ }
+}
Copied: trunk/src/northbridge/amd/amdfam10/sspr2.asl (from r5093, trunk/src/northbridge/amd/amdfam10/sspr2.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/sspr2.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/sspr2.dsl)
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+DefinitionBlock ("SSPR.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925441)
+{
+ Scope (\_SB)
+ {
+ Processor (\_SB.CPAA, 0xbb, 0x120, 6) // CPU0 and 0x01 need to be updated
+ {
+ Name(_PCT, Package ()
+ {
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_CTRL
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_STATUS
+ })
+
+ Name(_PSS, Package()
+ {
+ Package(0x06) {0x1111, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x7777, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ })
+ }
+
+ }
+}
Copied: trunk/src/northbridge/amd/amdfam10/sspr3.asl (from r5093, trunk/src/northbridge/amd/amdfam10/sspr3.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/sspr3.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/sspr3.dsl)
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+DefinitionBlock ("SSPR.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925441)
+{
+ Scope (\_SB)
+ {
+ Processor (\_SB.CPAA, 0xbb, 0x120, 6) // CPU0 and 0x01 need to be updated
+ {
+ Name(_PCT, Package ()
+ {
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_CTRL
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_STATUS
+ })
+
+ Name(_PSS, Package()
+ {
+ Package(0x06) {0x1111, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x7777, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x8888, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ })
+ }
+
+ }
+}
Copied: trunk/src/northbridge/amd/amdfam10/sspr4.asl (from r5093, trunk/src/northbridge/amd/amdfam10/sspr4.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/sspr4.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/sspr4.dsl)
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+DefinitionBlock ("SSPR.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925441)
+{
+ Scope (\_SB)
+ {
+ Processor (\_SB.CPAA, 0xbb, 0x120, 6) // CPU0 and 0x01 need to be updated
+ {
+ Name(_PCT, Package ()
+ {
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_CTRL
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_STATUS
+ })
+
+ Name(_PSS, Package()
+ {
+ Package(0x06) {0x1111, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x7777, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x8888, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x9999, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ })
+ }
+
+ }
+}
Copied: trunk/src/northbridge/amd/amdfam10/sspr5.asl (from r5093, trunk/src/northbridge/amd/amdfam10/sspr5.dsl)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/src/northbridge/amd/amdfam10/sspr5.asl Mon Feb 8 16:46:37 2010 (r5094, copy of r5093, trunk/src/northbridge/amd/amdfam10/sspr5.dsl)
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007 Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+DefinitionBlock ("SSPR.aml", "SSDT", 1, "AMD-FAM10", "AMD-ACPI", 100925441)
+{
+ Scope (\_SB)
+ {
+ Processor (\_SB.CPAA, 0xbb, 0x120, 6) // CPU0 and 0x01 need to be updated
+ {
+ Name(_PCT, Package ()
+ {
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_CTRL
+ ResourceTemplate() {Register (FFixedHW, 0, 0, 0)}, //PERF_STATUS
+ })
+
+ Name(_PSS, Package()
+ {
+ Package(0x06) {0x1111, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x7777, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x8888, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0x9999, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ Package(0x06) {0xaaaa, 0x222222, 0x3333, 0x4444, 0x55, 0x66 },
+ })
+ }
+
+ }
+}
More information about the coreboot
mailing list