summaryrefslogtreecommitdiff
path: root/src/mainboard/via
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/via')
-rw-r--r--src/mainboard/via/epia-m/Makefile.inc7
-rw-r--r--src/mainboard/via/epia-n/Makefile.inc7
-rw-r--r--src/mainboard/via/epia-n/acpi/irq_links.asl (renamed from src/mainboard/via/epia-n/irq_links.asl)0
-rw-r--r--src/mainboard/via/epia-n/acpi/pata_methods.asl (renamed from src/mainboard/via/epia-n/pata_methods.asl)0
-rw-r--r--src/mainboard/via/epia-n/acpi/pci_init.asl (renamed from src/mainboard/via/epia-n/pci_init.asl)0
-rw-r--r--src/mainboard/via/epia-n/acpi/sb_physical.asl (renamed from src/mainboard/via/epia-n/sb_physical.asl)2
-rw-r--r--src/mainboard/via/epia-n/dsdt.asl6
-rw-r--r--src/mainboard/via/epia/Makefile.inc7
-rw-r--r--src/mainboard/via/vt8454c/Makefile.inc7
-rw-r--r--src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl (renamed from src/mainboard/via/vt8454c/irq-p2p-bridge.dsl)0
-rw-r--r--src/mainboard/via/vt8454c/acpi/irq.asl (renamed from src/mainboard/via/vt8454c/irq.dsl)0
-rw-r--r--src/mainboard/via/vt8454c/dsdt.asl (renamed from src/mainboard/via/vt8454c/dsdt.dsl)4
12 files changed, 6 insertions, 34 deletions
diff --git a/src/mainboard/via/epia-m/Makefile.inc b/src/mainboard/via/epia-m/Makefile.inc
index 3c82c8513d..c7f0675063 100644
--- a/src/mainboard/via/epia-m/Makefile.inc
+++ b/src/mainboard/via/epia-m/Makefile.inc
@@ -46,13 +46,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
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 $@
diff --git a/src/mainboard/via/epia-n/Makefile.inc b/src/mainboard/via/epia-n/Makefile.inc
index f8d0e6fd9c..76d5ec5cdd 100644
--- a/src/mainboard/via/epia-n/Makefile.inc
+++ b/src/mainboard/via/epia-n/Makefile.inc
@@ -43,13 +43,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
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 $@
diff --git a/src/mainboard/via/epia-n/irq_links.asl b/src/mainboard/via/epia-n/acpi/irq_links.asl
index fc93e760b5..fc93e760b5 100644
--- a/src/mainboard/via/epia-n/irq_links.asl
+++ b/src/mainboard/via/epia-n/acpi/irq_links.asl
diff --git a/src/mainboard/via/epia-n/pata_methods.asl b/src/mainboard/via/epia-n/acpi/pata_methods.asl
index 68d505868e..68d505868e 100644
--- a/src/mainboard/via/epia-n/pata_methods.asl
+++ b/src/mainboard/via/epia-n/acpi/pata_methods.asl
diff --git a/src/mainboard/via/epia-n/pci_init.asl b/src/mainboard/via/epia-n/acpi/pci_init.asl
index 3169a03d50..3169a03d50 100644
--- a/src/mainboard/via/epia-n/pci_init.asl
+++ b/src/mainboard/via/epia-n/acpi/pci_init.asl
diff --git a/src/mainboard/via/epia-n/sb_physical.asl b/src/mainboard/via/epia-n/acpi/sb_physical.asl
index c59feb64f0..7dd7b1d7e8 100644
--- a/src/mainboard/via/epia-n/sb_physical.asl
+++ b/src/mainboard/via/epia-n/acpi/sb_physical.asl
@@ -154,7 +154,7 @@ Device (PATA)
}
}
- Include("pata_methods.asl")
+ #include "pata_methods.asl"
OperationRegion (PAPR, PCI_Config, 0x00, 0xC2)
diff --git a/src/mainboard/via/epia-n/dsdt.asl b/src/mainboard/via/epia-n/dsdt.asl
index 50d18131fd..90731501ed 100644
--- a/src/mainboard/via/epia-n/dsdt.asl
+++ b/src/mainboard/via/epia-n/dsdt.asl
@@ -88,7 +88,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CBT-V2", "CBT-DSDT", 1)
})
/* PCI Devices Included Here */
- Include("sb_physical.asl")
+ #include "acpi/sb_physical.asl"
/* Legacy PNP Devices Defined Here */
@@ -343,8 +343,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CBT-V2", "CBT-DSDT", 1)
})
}
- Include("irq_links.asl")
- Include("pci_init.asl")
+ #include "acpi/irq_links.asl"
+ #include "acpi/pci_init.asl"
} //End of PCI0
diff --git a/src/mainboard/via/epia/Makefile.inc b/src/mainboard/via/epia/Makefile.inc
index 4be56312fd..336cad6342 100644
--- a/src/mainboard/via/epia/Makefile.inc
+++ b/src/mainboard/via/epia/Makefile.inc
@@ -39,13 +39,6 @@ crt0s += $(src)/cpu/x86/mmx_disable.inc
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 $@
diff --git a/src/mainboard/via/vt8454c/Makefile.inc b/src/mainboard/via/vt8454c/Makefile.inc
index 8f321c2e4b..19b68fa861 100644
--- a/src/mainboard/via/vt8454c/Makefile.inc
+++ b/src/mainboard/via/vt8454c/Makefile.inc
@@ -42,13 +42,6 @@ ldscripts += $(src)/arch/i386/lib/failover.lds
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 $@
diff --git a/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
index 4a294bcbaa..4a294bcbaa 100644
--- a/src/mainboard/via/vt8454c/irq-p2p-bridge.dsl
+++ b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
diff --git a/src/mainboard/via/vt8454c/irq.dsl b/src/mainboard/via/vt8454c/acpi/irq.asl
index 63e64e61c0..63e64e61c0 100644
--- a/src/mainboard/via/vt8454c/irq.dsl
+++ b/src/mainboard/via/vt8454c/acpi/irq.asl
diff --git a/src/mainboard/via/vt8454c/dsdt.dsl b/src/mainboard/via/vt8454c/dsdt.asl
index 150fbcf5f9..ada6c95690 100644
--- a/src/mainboard/via/vt8454c/dsdt.dsl
+++ b/src/mainboard/via/vt8454c/dsdt.asl
@@ -298,7 +298,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
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 @@ DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
{
Name (_ADR, 0x00130001)
- Include ("irq-p2p-bridge.dsl")
+ #include "acpi/irq-p2p-bridge.asl"
Method (_PRT, 0, NotSerialized)
{
If (LNot (PICF))