[commit] r6075 - in trunk: . src/mainboard/getac/p470/acpi src/mainboard/roda/rk886ex/acpi src/superio/fintek/f71863fg src/superio/nsc/pc8374

[repository service]

Author: stepan
Date: Mon Nov 15 22:09:57 2010
New Revision: 6075
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6075

Log:
fix random breakage

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/Makefile
   trunk/src/mainboard/getac/p470/acpi/superio.asl
   trunk/src/mainboard/roda/rk886ex/acpi/superio.asl
   trunk/src/superio/fintek/f71863fg/superio.c
   trunk/src/superio/nsc/pc8374/superio.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Nov 15 20:44:42 2010	(r6074)
+++ trunk/Makefile	Mon Nov 15 22:09:57 2010	(r6075)
@@ -229,7 +229,7 @@
 $(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

Modified: trunk/src/mainboard/getac/p470/acpi/superio.asl
==============================================================================
--- trunk/src/mainboard/getac/p470/acpi/superio.asl	Mon Nov 15 20:44:42 2010	(r6074)
+++ trunk/src/mainboard/getac/p470/acpi/superio.asl	Mon Nov 15 22:09:57 2010	(r6075)
@@ -114,7 +114,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

@@ -269,7 +269,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

@@ -423,7 +423,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

@@ -575,7 +575,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

Modified: trunk/src/mainboard/roda/rk886ex/acpi/superio.asl
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/acpi/superio.asl	Mon Nov 15 20:44:42 2010	(r6074)
+++ trunk/src/mainboard/roda/rk886ex/acpi/superio.asl	Mon Nov 15 22:09:57 2010	(r6075)
@@ -116,7 +116,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

@@ -275,7 +275,7 @@
    	Method(_CRS, 0)
    	{
    		Name(NONE, ResourceTemplate() {
-				IO(Decode16, 0x000, 0x000, 0x0, 0x0)
+				IO(Decode16, 0x000, 0x000, 0x0, 0x1)
    			IRQNoFlags() { }
    		})

Modified: trunk/src/superio/fintek/f71863fg/superio.c
==============================================================================
--- trunk/src/superio/fintek/f71863fg/superio.c	Mon Nov 15 20:44:42 2010	(r6074)
+++ trunk/src/superio/fintek/f71863fg/superio.c	Mon Nov 15 22:09:57 2010	(r6075)
@@ -101,7 +101,7 @@
    { &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, },

Modified: trunk/src/superio/nsc/pc8374/superio.c
==============================================================================
--- trunk/src/superio/nsc/pc8374/superio.c	Mon Nov 15 20:44:42 2010	(r6074)
+++ trunk/src/superio/nsc/pc8374/superio.c	Mon Nov 15 22:09:57 2010	(r6075)
@@ -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)