i82801gx: replace cafed00d/cafebabe by defines

We're using '0xcafed00d' all over the code as magic for ACPI S3
resume. Let's add a define for that. Also replace 0xcafebabe by
a define.

Change-Id: I5f5dc09561679d19f98771c4f81830a50202c69f
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Reviewed-on: http://review.coreboot.org/33
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>

diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 029840487e2d5ba913709060cb12dece5cdbce96..0e05af176b71e9047bd01328e79edcd3260c27df 100644 (file)
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -378,7 +378,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
 }

diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c
index 6cf6a387e2021aa6a1f42657871fdc8f52a5068c..11f48a1cb4510286daf932a7600750f62639d251 100644 (file)
--- a/src/mainboard/ibase/mb899/romstage.c
+++ b/src/mainboard/ibase/mb899/romstage.c
@@ -332,7 +332,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
 }

diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index cba3146f9207f9ae07077a55e9d11c4ebf6cd4bb..d1ead82440a9444972a37aeb77ecbc90355f017e 100644 (file)
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -290,7 +290,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
 }

diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index 0d6816ca3920228e95ccaf0a50eb080755755d06..6d9f81e5710c244834981a28385644867aff7a71 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -431,7 +431,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
 }

diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 2e11cdb0eb5703fc134a9321872dbb30616c0654..b58ca4c43680d5f79e887cc667980acd642cf72f 100644 (file)
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -46,7 +46,7 @@ static void mainboard_enable(device_t dev)
 
        /* If we're resuming from suspend, blink suspend LED */
        dev0 = dev_find_slot(0, PCI_DEVFN(0,0));
-       if (dev0 && pci_read_config32(dev0, SKPAD) == 0xcafed00d)
+       if (dev0 && pci_read_config32(dev0, SKPAD) == SKPAD_ACPI_S3_MAGIC)
                ec_write(0x0c, 0xc7);
 
        idedev = dev_find_slot(0, PCI_DEVFN(0x1f,1));

diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index b659aa8025cb44b62f9afb31a745a297093e77c0..aa927651fcbc40886d474174d22d2eff6fa4d5a7 100644 (file)
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -333,7 +333,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
        /* Set legacy Brightness control to full brightness */

diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index d5c9d953c986562a2c1a0f58136737cc2631687c..8cd68bc88e26907eb0a812fa18f38023fca056b4 100644 (file)
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -47,7 +47,7 @@ static void mainboard_enable(device_t dev)
 
        /* If we're resuming from suspend, blink suspend LED */
        dev0 = dev_find_slot(0, PCI_DEVFN(0,0));
-       if (dev0 && pci_read_config32(dev0, SKPAD) == 0xcafed00d)
+       if (dev0 && pci_read_config32(dev0, SKPAD) == SKPAD_ACPI_S3_MAGIC)
                ec_write(0x0c, 0xc7);
 
        idedev = dev_find_slot(0, PCI_DEVFN(0x1f,1));

diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 9d01bf29ae9549c1db18b31c46bb3c411c9cb21c..c993a3565f192fd9eebbf3f278bef36e69318de5 100644 (file)
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -335,7 +335,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
        /* Set legacy Brightness control to full brightness */

diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index 9b9de250f5a1968e0499ae68a37dc1b86e8c9248..2af7c2beb5859d2598dc06e29f872c368a04e113 100644 (file)
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -367,7 +367,7 @@ void main(unsigned long bist)
                        memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
 
                /* Magic for S3 resume */
-               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafed00d);
+               pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_ACPI_S3_MAGIC);
        }
 #endif
 }

diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index 53d0d8c42c123786fd45a04d520632b75ecd7558..21efc37a53929be4b90cd4cbb5abf3c4f342ebfa 100644 (file)
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -186,7 +186,7 @@ static void i945_setup_bars(void)
        pci_write_config8(PCI_DEV(0, 0x00, 0), PAM5, 0x33);
        pci_write_config8(PCI_DEV(0, 0x00, 0), PAM6, 0x33);
 
-       pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, 0xcafebabe);
+       pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, SKPAD_NORMAL_BOOT_MAGIC);
        printk(BIOS_DEBUG, " done.\n");
 
        /* Wait for MCH BAR to come up */

diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 925d1081541d22728ceb9704f8031642c608f43e..dfe4fe73bd121f5fd7e87fc36bf69af95bbe7712 100644 (file)
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -257,11 +257,11 @@ extern u8 acpi_slp_type;
 static void northbridge_init(struct device *dev)
 {
        switch (pci_read_config32(dev, SKPAD)) {
-       case 0xcafebabe:
+       case SKPAD_NORMAL_BOOT_MAGIC:
                printk(BIOS_DEBUG, "Normal boot.\n");
                acpi_slp_type=0;
                break;
-       case 0xcafed00d:
+       case SKPAD_ACPI_S3_MAGIC:
                printk(BIOS_DEBUG, "S3 Resume.\n");
                acpi_slp_type=3;
                break;

diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h
index 9b0bb1ffd3618dddb63613f16baad5e3a7332b30..2ceb215df614c63df0a6e1c7c0f612a06948abac 100644 (file)
--- a/src/southbridge/intel/i82801gx/i82801gx.h
+++ b/src/southbridge/intel/i82801gx/i82801gx.h
@@ -365,5 +365,7 @@ void enable_usbdebug(unsigned int port);
 #define SS_CNT         0x50
 #define C3_RES         0x54
 
+#define SKPAD_ACPI_S3_MAGIC    0xcafed00d
+#define SKPAD_NORMAL_BOOT_MAGIC        0xcafebabe
 #endif /* __ACPI__ */
 #endif                         /* SOUTHBRIDGE_INTEL_I82801GX_I82801GX_H */