diff options
Diffstat (limited to 'src/mainboard/iwill')
26 files changed, 20 insertions, 49 deletions
diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc index 95af1006cf..69cee0ca8d 100644 --- a/src/mainboard/iwill/dk8_htx/Makefile.inc +++ b/src/mainboard/iwill/dk8_htx/Makefile.inc @@ -26,15 +26,13 @@ obj-y += get_bus_conf.o 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 @@ ldscripts += $(src)/arch/i386/lib/failover.lds 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 $@ diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl index 931d2b0333..19011dc47b 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8111.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111.asl @@ -89,9 +89,9 @@ } } - Include ("amd8111_pic.asl") + #include "amd8111_pic.asl" - Include ("amd8111_isa.asl") + #include "amd8111_isa.asl" Device (TP2P) { diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl index b68230607e..9d93e34e92 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8111_isa.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl @@ -170,7 +170,7 @@ IRQNoFlags () {1} }) } - Include ("superio.asl") + #include "superio.asl" } diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8111_pic.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111_pic.asl index 228f3f84f1..228f3f84f1 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8111_pic.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111_pic.asl diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8131.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl index fbc0b30e42..fbc0b30e42 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8131.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131.asl diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8131_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl index 163c0f6061..163c0f6061 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8131_2.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8131_2.asl diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8132_2.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl index 75ef72343a..75ef72343a 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8132_2.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8132_2.asl diff --git a/src/mainboard/iwill/dk8_htx/dx/amd8151.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8151.asl index 001d45b0fe..001d45b0fe 100644 --- a/src/mainboard/iwill/dk8_htx/dx/amd8151.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/amd8151.asl diff --git a/src/mainboard/iwill/dk8_htx/dx/htx_no_ioapic.asl b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl index 95a4860c63..95a4860c63 100644 --- a/src/mainboard/iwill/dk8_htx/dx/htx_no_ioapic.asl +++ b/src/mainboard/iwill/dk8_htx/acpi/htx_no_ioapic.asl diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl new file mode 100644 index 0000000000..2fd3b09de4 --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/pci0_hc.asl @@ -0,0 +1,2 @@ + #include "amd8111.asl" //real SB at first + #include "amd8131.asl" diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl new file mode 100644 index 0000000000..fd3ad2c3e3 --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/pci2_hc.asl @@ -0,0 +1 @@ + #include "amd8132_2.asl" diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl new file mode 100644 index 0000000000..070ebe5286 --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/pci3_hc.asl @@ -0,0 +1 @@ + #include "amd8151.asl" diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl new file mode 100644 index 0000000000..bd3f70ea0f --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/pci4_hc.asl @@ -0,0 +1 @@ + #include "amd8131_2.asl" diff --git a/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl b/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl new file mode 100644 index 0000000000..f7f0a7dbad --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/pci5_hc.asl @@ -0,0 +1 @@ + #include "htx_no_ioapic.asl" diff --git a/src/mainboard/iwill/dk8_htx/acpi/superio.asl b/src/mainboard/iwill/dk8_htx/acpi/superio.asl new file mode 100644 index 0000000000..83ee58253d --- /dev/null +++ b/src/mainboard/iwill/dk8_htx/acpi/superio.asl @@ -0,0 +1 @@ +// #include "w83627hf.asl" diff --git a/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl b/src/mainboard/iwill/dk8_htx/dsdt.asl index 940be88954..ee87023ff8 100644 --- a/src/mainboard/iwill/dk8_htx/dx/dsdt_lb.dsl +++ b/src/mainboard/iwill/dk8_htx/dsdt.asl @@ -103,7 +103,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440) Return (Local3) } - Include ("pci0_hc.asl") + #include "acpi/pci0_hc.asl" } Device (PCI1) @@ -206,7 +206,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-K8", "AMDACPI", 100925440) Z00A, 8 } - Include ("../../../../../src/northbridge/amd/amdk8/amdk8_util.asl") + #include "northbridge/amd/amdk8/amdk8_util.asl" } diff --git a/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl deleted file mode 100644 index b1e9562f6b..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/pci0_hc.asl +++ /dev/null @@ -1,2 +0,0 @@ - Include ("amd8111.asl") //real SB at first - Include ("amd8131.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl deleted file mode 100644 index 03443adce5..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/pci2_hc.asl +++ /dev/null @@ -1 +0,0 @@ - Include ("amd8132_2.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl deleted file mode 100644 index 045d090392..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/pci3_hc.asl +++ /dev/null @@ -1 +0,0 @@ - Include ("amd8151.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl deleted file mode 100644 index 5b9a420681..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/pci4_hc.asl +++ /dev/null @@ -1 +0,0 @@ - Include ("amd8131_2.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl b/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl deleted file mode 100644 index 6b9276cf04..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/pci5_hc.asl +++ /dev/null @@ -1 +0,0 @@ - Include ("htx_no_ioapic.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/superio.asl b/src/mainboard/iwill/dk8_htx/dx/superio.asl deleted file mode 100644 index 86a10a94ae..0000000000 --- a/src/mainboard/iwill/dk8_htx/dx/superio.asl +++ /dev/null @@ -1 +0,0 @@ -// Include ("w83627hf.asl") diff --git a/src/mainboard/iwill/dk8_htx/dx/pci2.asl b/src/mainboard/iwill/dk8_htx/ssdt2.asl index 217491ad0a..582ef97621 100644 --- a/src/mainboard/iwill/dk8_htx/dx/pci2.asl +++ b/src/mainboard/iwill/dk8_htx/ssdt2.asl @@ -60,7 +60,7 @@ DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440) Return (Local3) } - Include ("pci2_hc.asl") + #include "acpi/pci2_hc.asl" } } diff --git a/src/mainboard/iwill/dk8_htx/dx/pci3.asl b/src/mainboard/iwill/dk8_htx/ssdt3.asl index 1507cfc0f9..583e945740 100644 --- a/src/mainboard/iwill/dk8_htx/dx/pci3.asl +++ b/src/mainboard/iwill/dk8_htx/ssdt3.asl @@ -60,7 +60,7 @@ DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440) Return (Local3) } - Include ("pci3_hc.asl") + #include "acpi/pci3_hc.asl" } } diff --git a/src/mainboard/iwill/dk8_htx/dx/pci4.asl b/src/mainboard/iwill/dk8_htx/ssdt4.asl index 3ced9be7f7..fd7224d17a 100644 --- a/src/mainboard/iwill/dk8_htx/dx/pci4.asl +++ b/src/mainboard/iwill/dk8_htx/ssdt4.asl @@ -60,7 +60,7 @@ DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440) Return (Local3) } - Include ("pci4_hc.asl") + #include "acpi/pci4_hc.asl" } } diff --git a/src/mainboard/iwill/dk8_htx/dx/pci5.asl b/src/mainboard/iwill/dk8_htx/ssdt5.asl index 5f251616f0..7592301902 100644 --- a/src/mainboard/iwill/dk8_htx/dx/pci5.asl +++ b/src/mainboard/iwill/dk8_htx/ssdt5.asl @@ -60,7 +60,7 @@ DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMD-K8", "AMDACPI", 100925440) Return (Local3) } - Include ("pci5_hc.asl") + #include "acpi/pci5_hc.asl" } } |