fix random breakage

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6075 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index be6cd3857b2c337dd4d969a4275cc6093597a63d..397e51d301c67de902cc218cf2aa51a55590ec99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,7 @@ define ramstage-objs_asl_template
 $(obj)/$(1).ramstage.o: src/$(1).asl
        @printf "    IASL       $$(subst $(top)/,,$$(@))\n"
        $(CPP) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
-       iasl -p $$(obj)/$(1) -tc $$(basename $$@).asl > $$(basename $$@).asl.out
+       iasl -p $$(obj)/$(1) -tc $$(basename $$@).asl
        mv $$(obj)/$(1).hex $$(basename $$@).c
        $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c
        # keep %.o: %.c rule from catching the temporary .c file after a make clean

diff --git a/src/mainboard/getac/p470/acpi/superio.asl b/src/mainboard/getac/p470/acpi/superio.asl
index 95cd1c1ed7097079be516152377baaf3f51d7ed4..e84c204d98dccc4668f017f451a7616868dcda14 100644 (file)
--- a/src/mainboard/getac/p470/acpi/superio.asl
+++ b/src/mainboard/getac/p470/acpi/superio.asl
@@ -114,7 +114,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 
@@ -269,7 +269,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 
@@ -423,7 +423,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 
@@ -575,7 +575,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 

diff --git a/src/mainboard/roda/rk886ex/acpi/superio.asl b/src/mainboard/roda/rk886ex/acpi/superio.asl
index 31cb44ad642a3f827af68702dbe61b37a78bb732..184ff29dd23e8ca10d6950f510cab3e23a5e9137 100644 (file)
--- a/src/mainboard/roda/rk886ex/acpi/superio.asl
+++ b/src/mainboard/roda/rk886ex/acpi/superio.asl
@@ -116,7 +116,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 
@@ -275,7 +275,7 @@ Device (SIO1)
                Method(_CRS, 0)
                {
                        Name(NONE, ResourceTemplate() {
-                               IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+                               IO(Decode16, 0x000, 0x000, 0x0, 0x1)
                                IRQNoFlags() { }
                        })
 

diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index f54d3ad22bdecca5b90077005a877e1cf1920562..92e317b02c68c1b2929cb4d217df6010741dc965 100644 (file)
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -101,7 +101,7 @@ static struct pnp_info pnp_dev_info[] = {
        { &ops, F71863FG_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
        { &ops, F71863FG_HWM,  PNP_IO0 | PNP_IRQ0, {0x0ff8, 0}, },
        { &ops, F71863FG_KBC,  PNP_IO0 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, },
-       { &ops, F71863FG_GPIO, }
+       { &ops, F71863FG_GPIO, },
        { &ops, F71863FG_VID,  PNP_IO0, {0x07f8, 0}, },
        { &ops, F71863FG_SPI, },
        { &ops, F71863FG_PME, },

diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 247aae913ed77ea3e9f2ce30f47f60bf3ed757f0..0dd33d597e6d40875cd745835950501dd8b7b1ca 100644 (file)
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -33,7 +33,7 @@
 
 static void init(device_t dev)
 {
-       struct superio_nsc_pc8374_config *conf = dev­>chip_info;
+       struct superio_nsc_pc8374_config *conf = dev->chip_info;
        struct resource *res0;
 
        if (!dev->enabled)