Index: src/mainboard/Makefile.k8_ck804.inc =================================================================== --- src/mainboard/Makefile.k8_ck804.inc (revision 5093) +++ src/mainboard/Makefile.k8_ck804.inc (working copy) @@ -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 $@ Index: src/mainboard/iwill/dk8_htx/ssdt4.asl =================================================================== --- src/mainboard/iwill/dk8_htx/ssdt4.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/ssdt4.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci4_hc.asl") + #include "acpi/pci4_hc.asl" } } Index: src/mainboard/iwill/dk8_htx/ssdt5.asl =================================================================== --- src/mainboard/iwill/dk8_htx/ssdt5.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/ssdt5.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci5_hc.asl") + #include "acpi/pci5_hc.asl" } } Index: src/mainboard/iwill/dk8_htx/Makefile.inc =================================================================== --- src/mainboard/iwill/dk8_htx/Makefile.inc (revision 5093) +++ src/mainboard/iwill/dk8_htx/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8111_pic.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8111.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8131.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8151.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/htx_no_ioapic.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/superio.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci2.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci3.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci4.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8131_2.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/amd8132_2.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dx/pci5.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl (working copy) @@ -1,2 +1,2 @@ - Include ("amd8111.asl") //real SB at first - Include ("amd8131.asl") + #include "amd8111.asl" //real SB at first + #include "amd8131.asl" Index: src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8132_2.asl") + #include "amd8132_2.asl" Index: src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl (working copy) @@ -170,7 +170,7 @@ IRQNoFlags () {1} }) } - Include ("superio.asl") + #include "superio.asl" } Index: src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8151.asl") + #include "amd8151.asl" Index: src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8131_2.asl") + #include "amd8131_2.asl" Index: src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl (working copy) @@ -1 +1 @@ - Include ("htx_no_ioapic.asl") + #include "htx_no_ioapic.asl" Index: src/mainboard/iwill/dk8_htx/acpi/amd8111.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/amd8111.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/amd8111.asl (working copy) @@ -89,9 +89,9 @@ } } - Include ("amd8111_pic.asl") + #include "amd8111_pic.asl" - Include ("amd8111_isa.asl") + #include "amd8111_isa.asl" Device (TP2P) { Index: src/mainboard/iwill/dk8_htx/acpi/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/acpi/superio.asl =================================================================== --- src/mainboard/iwill/dk8_htx/acpi/superio.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/acpi/superio.asl (working copy) @@ -1 +1 @@ -// Include ("w83627hf.asl") +// #include "w83627hf.asl" Index: src/mainboard/iwill/dk8_htx/acpi/pci2.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/acpi/pci3.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/acpi/pci4.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/acpi/pci5.asl (deleted) =================================================================== Index: src/mainboard/iwill/dk8_htx/dsdt.asl =================================================================== --- src/mainboard/iwill/dk8_htx/dsdt.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/dsdt.asl (working copy) @@ -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" } Index: src/mainboard/iwill/dk8_htx/ssdt2.asl =================================================================== --- src/mainboard/iwill/dk8_htx/ssdt2.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/ssdt2.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci2_hc.asl") + #include "acpi/pci2_hc.asl" } } Index: src/mainboard/iwill/dk8_htx/ssdt3.asl =================================================================== --- src/mainboard/iwill/dk8_htx/ssdt3.asl (revision 5093) +++ src/mainboard/iwill/dk8_htx/ssdt3.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci3_hc.asl") + #include "acpi/pci3_hc.asl" } } Index: src/mainboard/bcom/winnetp680/Makefile.inc =================================================================== --- src/mainboard/bcom/winnetp680/Makefile.inc (revision 5093) +++ src/mainboard/bcom/winnetp680/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/supermicro/h8dmr/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr/Makefile.inc (revision 5093) +++ src/mainboard/supermicro/h8dmr/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/supermicro/h8dme/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dme/Makefile.inc (revision 5093) +++ src/mainboard/supermicro/h8dme/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/supermicro/h8dmr_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (revision 5093) +++ src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/supermicro/h8qme_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8qme_fam10/Makefile.inc (revision 5093) +++ src/mainboard/supermicro/h8qme_fam10/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/kontron/986lcd-m/Makefile.inc =================================================================== --- src/mainboard/kontron/986lcd-m/Makefile.inc (revision 5093) +++ src/mainboard/kontron/986lcd-m/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/kontron/kt690/Makefile.inc =================================================================== --- src/mainboard/kontron/kt690/Makefile.inc (revision 5093) +++ src/mainboard/kontron/kt690/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/kontron/kt690/acpi/globutil.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/globutil.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/globutil.asl (working copy) @@ -19,7 +19,7 @@ /* Scope(\_SB) { - Include ("globutil.asl") + #include "globutil.asl" } */ Index: src/mainboard/kontron/kt690/acpi/ide.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/ide.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/ide.asl (working copy) @@ -22,7 +22,7 @@ Device(PCI0) { Device(IDEC) { Name(_ADR, 0x00140001) - Include ("ide.asl") + #include "ide.asl" } } } Index: src/mainboard/kontron/kt690/acpi/debug.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/debug.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/debug.asl (working copy) @@ -27,7 +27,7 @@ 0x00010001 ) { - Include ("debug.asl") + #include "debug.asl" } */ Index: src/mainboard/kontron/kt690/acpi/routing.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/routing.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/routing.asl (working copy) @@ -21,7 +21,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("routing.asl") + #include "routing.asl" } */ Index: src/mainboard/kontron/kt690/acpi/sata.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/sata.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/sata.asl (working copy) @@ -24,7 +24,7 @@ Device(PCI0) { Device(SATA) { Name(_ADR, 0x00120000) - Include ("sata.asl") + #include "sata.asl" } } } Index: src/mainboard/kontron/kt690/acpi/usb.asl =================================================================== --- src/mainboard/kontron/kt690/acpi/usb.asl (revision 5093) +++ src/mainboard/kontron/kt690/acpi/usb.asl (working copy) @@ -22,7 +22,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("usb.asl") + #include "usb.asl" } */ Method(UCOC, 0) { Index: src/mainboard/kontron/kt690/acpi/dsdt.asl (deleted) =================================================================== Index: src/mainboard/kontron/kt690/dsdt.asl =================================================================== --- src/mainboard/kontron/kt690/dsdt.asl (revision 5093) +++ src/mainboard/kontron/kt690/dsdt.asl (working copy) @@ -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) { Index: src/mainboard/gigabyte/m57sli/Makefile.inc =================================================================== --- src/mainboard/gigabyte/m57sli/Makefile.inc (revision 5093) +++ src/mainboard/gigabyte/m57sli/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/gigabyte/m57sli/dsdt.asl =================================================================== --- src/mainboard/gigabyte/m57sli/dsdt.asl (revision 5093) +++ src/mainboard/gigabyte/m57sli/dsdt.asl (working copy) @@ -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 Index: src/mainboard/amd/pistachio/Makefile.inc =================================================================== --- src/mainboard/amd/pistachio/Makefile.inc (revision 5093) +++ src/mainboard/amd/pistachio/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/amd/pistachio/acpi/globutil.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/globutil.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/globutil.asl (working copy) @@ -19,7 +19,7 @@ /* Scope(\_SB) { - Include ("globutil.asl") + #include "globutil.asl" } */ Index: src/mainboard/amd/pistachio/acpi/ide.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/ide.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/ide.asl (working copy) @@ -22,7 +22,7 @@ Device(PCI0) { Device(IDEC) { Name(_ADR, 0x00140001) - Include ("ide.asl") + #include "ide.asl" } } } Index: src/mainboard/amd/pistachio/acpi/debug.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/debug.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/debug.asl (working copy) @@ -27,7 +27,7 @@ 0x00010001 ) { - Include ("debug.asl") + #include "debug.asl" } */ Index: src/mainboard/amd/pistachio/acpi/routing.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/routing.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/routing.asl (working copy) @@ -21,7 +21,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("routing.asl") + #include "routing.asl" } */ Index: src/mainboard/amd/pistachio/acpi/sata.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/sata.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/sata.asl (working copy) @@ -24,7 +24,7 @@ Device(PCI0) { Device(SATA) { Name(_ADR, 0x00120000) - Include ("sata.asl") + #include "sata.asl" } } } Index: src/mainboard/amd/pistachio/acpi/usb.asl =================================================================== --- src/mainboard/amd/pistachio/acpi/usb.asl (revision 5093) +++ src/mainboard/amd/pistachio/acpi/usb.asl (working copy) @@ -22,7 +22,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("usb.asl") + #include "usb.asl" } */ Method(UCOC, 0) { Index: src/mainboard/amd/pistachio/acpi/dsdt.asl (deleted) =================================================================== Index: src/mainboard/amd/pistachio/dsdt.asl =================================================================== --- src/mainboard/amd/pistachio/dsdt.asl (revision 5093) +++ src/mainboard/amd/pistachio/dsdt.asl (working copy) @@ -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) { Index: src/mainboard/amd/dbm690t/Makefile.inc =================================================================== --- src/mainboard/amd/dbm690t/Makefile.inc (revision 5093) +++ src/mainboard/amd/dbm690t/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/amd/dbm690t/acpi/globutil.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/globutil.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/globutil.asl (working copy) @@ -19,7 +19,7 @@ /* Scope(\_SB) { - Include ("globutil.asl") + #include "globutil.asl" } */ Index: src/mainboard/amd/dbm690t/acpi/ide.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/ide.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/ide.asl (working copy) @@ -22,7 +22,7 @@ Device(PCI0) { Device(IDEC) { Name(_ADR, 0x00140001) - Include ("ide.asl") + #include "ide.asl" } } } Index: src/mainboard/amd/dbm690t/acpi/debug.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/debug.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/debug.asl (working copy) @@ -27,7 +27,7 @@ 0x00010001 ) { - Include ("debug.asl") + #include "debug.asl" } */ Index: src/mainboard/amd/dbm690t/acpi/routing.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/routing.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/routing.asl (working copy) @@ -21,7 +21,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("routing.asl") + #include "routing.asl" } */ Index: src/mainboard/amd/dbm690t/acpi/sata.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/sata.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/sata.asl (working copy) @@ -24,7 +24,7 @@ Device(PCI0) { Device(SATA) { Name(_ADR, 0x00120000) - Include ("sata.asl") + #include "sata.asl" } } } Index: src/mainboard/amd/dbm690t/acpi/usb.asl =================================================================== --- src/mainboard/amd/dbm690t/acpi/usb.asl (revision 5093) +++ src/mainboard/amd/dbm690t/acpi/usb.asl (working copy) @@ -22,7 +22,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("usb.asl") + #include "usb.asl" } */ Method(UCOC, 0) { Index: src/mainboard/amd/dbm690t/acpi/dsdt.asl (deleted) =================================================================== Index: src/mainboard/amd/dbm690t/dsdt.asl =================================================================== --- src/mainboard/amd/dbm690t/dsdt.asl (revision 5093) +++ src/mainboard/amd/dbm690t/dsdt.asl (working copy) @@ -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) { Index: src/mainboard/amd/serengeti_cheetah/ssdt4.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/ssdt4.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/ssdt4.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci4_hc.asl") + #include "acpi/pci4_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah/Makefile.inc (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/amd/serengeti_cheetah/readme_acpi.txt =================================================================== --- src/mainboard/amd/serengeti_cheetah/readme_acpi.txt (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/readme_acpi.txt (working copy) @@ -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 Index: src/mainboard/amd/serengeti_cheetah/dx/pci0_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8111_pic.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci2_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8111_isa.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci3_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci4_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8111.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8131.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8151.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/superio.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci3.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8131_2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/pci4.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dx/amd8132_2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/pci0_hc.asl (working copy) @@ -1,2 +1,2 @@ - Include ("amd8111.asl") //real SB at first - Include ("amd8131.asl") + #include "amd8111.asl" //real SB at first + #include "amd8131.asl" Index: src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/pci2_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8132_2.asl") + #include "amd8132_2.asl" Index: src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/pci3_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8151.asl") + #include "amd8151.asl" Index: src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl (working copy) @@ -170,7 +170,7 @@ IRQNoFlags () {1} }) } - Include ("superio.asl") + #include "superio.asl" } Index: src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/pci4_hc.asl (working copy) @@ -1 +1 @@ - Include ("amd8131_2.asl") + #include "amd8131_2.asl" Index: src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/amd8111.asl (working copy) @@ -89,9 +89,9 @@ } } - Include ("amd8111_pic.asl") + #include "amd8111_pic.asl" - Include ("amd8111_isa.asl") + #include "amd8111_isa.asl" Device (TP2P) { Index: src/mainboard/amd/serengeti_cheetah/acpi/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/acpi/superio.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/acpi/superio.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/acpi/superio.asl (working copy) @@ -1 +1 @@ -// Include ("w83627hf.asl") +// #include "w83627hf.asl" Index: src/mainboard/amd/serengeti_cheetah/acpi/pci2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/acpi/pci3.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/acpi/pci4.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah/dsdt.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/dsdt.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/dsdt.asl (working copy) @@ -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" } Index: src/mainboard/amd/serengeti_cheetah/ssdt2.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/ssdt2.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/ssdt2.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci2_hc.asl") + #include "acpi/pci2_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah/ssdt3.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah/ssdt3.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah/ssdt3.asl (working copy) @@ -60,7 +60,7 @@ Return (Local3) } - Include ("pci3_hc.asl") + #include "acpi/pci3_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl (working copy) @@ -75,7 +75,7 @@ Return (Local3) } - Include ("pci4_hc.asl") + #include "acpi/pci4_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl (working copy) @@ -76,7 +76,7 @@ Return (Local3) } - Include ("pci5_hc.asl") + #include "acpi/pci5_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci0_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_pic.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111_isa.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5_hc.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8111.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8151.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/htx_no_ioapic.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/superio.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci3.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci4.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8131_2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/amd8132_2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dx/pci5.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl (working copy) @@ -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" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl (working copy) @@ -17,4 +17,4 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // - Include ("amd8132_2.asl") + #include "amd8132_2.asl" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl (working copy) @@ -186,7 +186,7 @@ IRQNoFlags () {1} }) } - Include ("superio.asl") + #include "superio.asl" } Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl (working copy) @@ -17,4 +17,4 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // - Include ("amd8151.asl") + #include "amd8151.asl" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl (working copy) @@ -17,4 +17,4 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // - Include ("amd8131_2.asl") + #include "amd8131_2.asl" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl (working copy) @@ -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" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl (working copy) @@ -97,9 +97,9 @@ } } - Include ("amd8111_pic.asl") + #include "amd8111_pic.asl" - Include ("amd8111_isa.asl") + #include "amd8111_isa.asl" Device (TP2P) { Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/dsdt_lb.dsl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl (working copy) @@ -17,4 +17,4 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -// Include ("w83627hf.asl") +// #include "w83627hf.asl" Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5.asl (deleted) =================================================================== Index: src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl (working copy) @@ -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" } Index: src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl (working copy) @@ -75,7 +75,7 @@ Return (Local3) } - Include ("pci2_hc.asl") + #include "acpi/pci2_hc.asl" } } Index: src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl (revision 5093) +++ src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl (working copy) @@ -75,7 +75,7 @@ Return (Local3) } - Include ("pci3_hc.asl") + #include "acpi/pci3_hc.asl" } } Index: src/mainboard/tyan/s2912/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912/Makefile.inc (revision 5093) +++ src/mainboard/tyan/s2912/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/tyan/s2735/Makefile.inc =================================================================== --- src/mainboard/tyan/s2735/Makefile.inc (revision 5093) +++ src/mainboard/tyan/s2735/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/tyan/s2891/dsdt.dsl (deleted) =================================================================== Index: src/mainboard/tyan/s2891/dsdt.asl =================================================================== --- src/mainboard/tyan/s2891/dsdt.asl (revision 5093) +++ src/mainboard/tyan/s2891/dsdt.asl (working copy) @@ -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 Index: src/mainboard/tyan/s2892/dsdt.dsl (deleted) =================================================================== Index: src/mainboard/tyan/s2892/dsdt.asl =================================================================== --- src/mainboard/tyan/s2892/dsdt.asl (revision 5093) +++ src/mainboard/tyan/s2892/dsdt.asl (working copy) @@ -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 Index: src/mainboard/tyan/s2895/dsdt.dsl (deleted) =================================================================== Index: src/mainboard/tyan/s2895/dsdt.asl =================================================================== --- src/mainboard/tyan/s2895/dsdt.asl (revision 5093) +++ src/mainboard/tyan/s2895/dsdt.asl (working copy) @@ -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 Index: src/mainboard/tyan/s2912_fam10/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912_fam10/Makefile.inc (revision 5093) +++ src/mainboard/tyan/s2912_fam10/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/via/vt8454c/dsdt.dsl (deleted) =================================================================== Index: src/mainboard/via/vt8454c/Makefile.inc =================================================================== --- src/mainboard/via/vt8454c/Makefile.inc (revision 5093) +++ src/mainboard/via/vt8454c/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/via/vt8454c/irq-p2p-bridge.dsl (deleted) =================================================================== Index: src/mainboard/via/vt8454c/irq.dsl (deleted) =================================================================== Index: src/mainboard/via/vt8454c/dsdt.asl =================================================================== --- src/mainboard/via/vt8454c/dsdt.asl (revision 5093) +++ src/mainboard/via/vt8454c/dsdt.asl (working copy) @@ -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)) Index: src/mainboard/via/epia-m/Makefile.inc =================================================================== --- src/mainboard/via/epia-m/Makefile.inc (revision 5093) +++ src/mainboard/via/epia-m/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/via/epia-n/Makefile.inc =================================================================== --- src/mainboard/via/epia-n/Makefile.inc (revision 5093) +++ src/mainboard/via/epia-n/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/via/epia-n/pata_methods.asl (deleted) =================================================================== Index: src/mainboard/via/epia-n/irq_links.asl (deleted) =================================================================== Index: src/mainboard/via/epia-n/acpi/sb_physical.asl =================================================================== --- src/mainboard/via/epia-n/acpi/sb_physical.asl (revision 0) +++ src/mainboard/via/epia-n/acpi/sb_physical.asl (working copy) @@ -154,7 +154,7 @@ } } - Include("pata_methods.asl") + #include "pata_methods.asl" OperationRegion (PAPR, PCI_Config, 0x00, 0xC2) Index: src/mainboard/via/epia-n/pci_init.asl (deleted) =================================================================== Index: src/mainboard/via/epia-n/dsdt.asl =================================================================== --- src/mainboard/via/epia-n/dsdt.asl (revision 5093) +++ src/mainboard/via/epia-n/dsdt.asl (working copy) @@ -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 Index: src/mainboard/via/epia-n/sb_physical.asl (deleted) =================================================================== Index: src/mainboard/via/epia/Makefile.inc =================================================================== --- src/mainboard/via/epia/Makefile.inc (revision 5093) +++ src/mainboard/via/epia/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/roda/rk886ex/Makefile.inc =================================================================== --- src/mainboard/roda/rk886ex/Makefile.inc (revision 5093) +++ src/mainboard/roda/rk886ex/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/msi/ms9282/Makefile.inc =================================================================== --- src/mainboard/msi/ms9282/Makefile.inc (revision 5093) +++ src/mainboard/msi/ms9282/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/msi/ms7260/Makefile.inc =================================================================== --- src/mainboard/msi/ms7260/Makefile.inc (revision 5093) +++ src/mainboard/msi/ms7260/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/Makefile.k8_CAR.inc =================================================================== --- src/mainboard/Makefile.k8_CAR.inc (revision 5093) +++ src/mainboard/Makefile.k8_CAR.inc (working copy) @@ -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 $@ Index: src/mainboard/technexion/tim8690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim8690/Makefile.inc (revision 5093) +++ src/mainboard/technexion/tim8690/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/technexion/tim8690/acpi/globutil.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/globutil.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/globutil.asl (working copy) @@ -19,7 +19,7 @@ /* Scope(\_SB) { - Include ("globutil.asl") + #include "globutil.asl" } */ Index: src/mainboard/technexion/tim8690/acpi/ide.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/ide.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/ide.asl (working copy) @@ -22,7 +22,7 @@ Device(PCI0) { Device(IDEC) { Name(_ADR, 0x00140001) - Include ("ide.asl") + #include "ide.asl" } } } Index: src/mainboard/technexion/tim8690/acpi/debug.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/debug.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/debug.asl (working copy) @@ -27,7 +27,7 @@ 0x00010001 ) { - Include ("debug.asl") + #include "debug.asl" } */ Index: src/mainboard/technexion/tim8690/acpi/routing.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/routing.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/routing.asl (working copy) @@ -21,7 +21,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("routing.asl") + #include "routing.asl" } */ Index: src/mainboard/technexion/tim8690/acpi/sata.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/sata.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/sata.asl (working copy) @@ -24,7 +24,7 @@ Device(PCI0) { Device(SATA) { Name(_ADR, 0x00120000) - Include ("sata.asl") + #include "sata.asl" } } } Index: src/mainboard/technexion/tim8690/acpi/usb.asl =================================================================== --- src/mainboard/technexion/tim8690/acpi/usb.asl (revision 5093) +++ src/mainboard/technexion/tim8690/acpi/usb.asl (working copy) @@ -22,7 +22,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("usb.asl") + #include "usb.asl" } */ Method(UCOC, 0) { Index: src/mainboard/technexion/tim8690/acpi/dsdt.asl (deleted) =================================================================== Index: src/mainboard/technexion/tim8690/dsdt.asl =================================================================== --- src/mainboard/technexion/tim8690/dsdt.asl (revision 5093) +++ src/mainboard/technexion/tim8690/dsdt.asl (working copy) @@ -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) { Index: src/mainboard/technexion/tim5690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim5690/Makefile.inc (revision 5093) +++ src/mainboard/technexion/tim5690/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/technexion/tim5690/acpi/globutil.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/globutil.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/globutil.asl (working copy) @@ -19,7 +19,7 @@ /* Scope(\_SB) { - Include ("globutil.asl") + #include "globutil.asl" } */ Index: src/mainboard/technexion/tim5690/acpi/ide.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/ide.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/ide.asl (working copy) @@ -22,7 +22,7 @@ Device(PCI0) { Device(IDEC) { Name(_ADR, 0x00140001) - Include ("ide.asl") + #include "ide.asl" } } } Index: src/mainboard/technexion/tim5690/acpi/debug.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/debug.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/debug.asl (working copy) @@ -27,7 +27,7 @@ 0x00010001 ) { - Include ("debug.asl") + #include "debug.asl" } */ Index: src/mainboard/technexion/tim5690/acpi/routing.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/routing.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/routing.asl (working copy) @@ -21,7 +21,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("routing.asl") + #include "routing.asl" } */ Index: src/mainboard/technexion/tim5690/acpi/sata.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/sata.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/sata.asl (working copy) @@ -24,7 +24,7 @@ Device(PCI0) { Device(SATA) { Name(_ADR, 0x00120000) - Include ("sata.asl") + #include "sata.asl" } } } Index: src/mainboard/technexion/tim5690/acpi/usb.asl =================================================================== --- src/mainboard/technexion/tim5690/acpi/usb.asl (revision 5093) +++ src/mainboard/technexion/tim5690/acpi/usb.asl (working copy) @@ -22,7 +22,7 @@ DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001 ) { - Include ("usb.asl") + #include "usb.asl" } */ Method(UCOC, 0) { Index: src/mainboard/technexion/tim5690/acpi/dsdt.asl (deleted) =================================================================== Index: src/mainboard/technexion/tim5690/dsdt.asl =================================================================== --- src/mainboard/technexion/tim5690/dsdt.asl (revision 5093) +++ src/mainboard/technexion/tim5690/dsdt.asl (working copy) @@ -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) { Index: src/mainboard/intel/d945gclf/Makefile.inc =================================================================== --- src/mainboard/intel/d945gclf/Makefile.inc (revision 5093) +++ src/mainboard/intel/d945gclf/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/intel/eagleheights/dsdt.dsl (deleted) =================================================================== Index: src/mainboard/intel/eagleheights/Makefile.inc =================================================================== --- src/mainboard/intel/eagleheights/Makefile.inc (revision 5093) +++ src/mainboard/intel/eagleheights/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/asus/a8v-e_se/Makefile.inc =================================================================== --- src/mainboard/asus/a8v-e_se/Makefile.inc (revision 5093) +++ src/mainboard/asus/a8v-e_se/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/asus/a8n_e/Makefile.inc =================================================================== --- src/mainboard/asus/a8n_e/Makefile.inc (revision 5093) +++ src/mainboard/asus/a8n_e/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/asus/m2v-mx_se/Makefile.inc =================================================================== --- src/mainboard/asus/m2v-mx_se/Makefile.inc (revision 5093) +++ src/mainboard/asus/m2v-mx_se/Makefile.inc (working copy) @@ -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 $@ Index: src/mainboard/asus/m2v-mx_se/dsdt.asl =================================================================== --- src/mainboard/asus/m2v-mx_se/dsdt.asl (revision 5093) +++ src/mainboard/asus/m2v-mx_se/dsdt.asl (working copy) @@ -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 Index: src/northbridge/amd/amdfam10/Makefile.inc =================================================================== --- src/northbridge/amd/amdfam10/Makefile.inc (revision 5093) +++ src/northbridge/amd/amdfam10/Makefile.inc (working copy) @@ -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 - Index: src/northbridge/amd/amdfam10/sspr1.dsl (deleted) =================================================================== Index: src/northbridge/amd/amdfam10/sspr2.dsl (deleted) =================================================================== Index: src/northbridge/amd/amdfam10/sspr3.dsl (deleted) =================================================================== Index: src/northbridge/amd/amdfam10/sspr4.dsl (deleted) =================================================================== Index: src/northbridge/amd/amdfam10/sspr5.dsl (deleted) =================================================================== Index: src/northbridge/amd/amdfam10/ssdt.dsl (deleted) =================================================================== Index: Makefile =================================================================== --- Makefile (revision 5093) +++ Makefile (working copy) @@ -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))