diff options
| author | Myles Watson <mylesgw@gmail.com> | 2010-04-09 03:41:23 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2010-04-09 03:41:23 +0000 |
| commit | ae60855f918dfc7f3f560528296fdd2d4b4ca791 (patch) | |
| tree | 03d6d96f688b0c70756520413ee88cca59b2f122 /src/mainboard/intel | |
| parent | e64b63750f029dac66902dee8cf6a7cf82ba44a3 (diff) | |
Copy acpi blobs in two parts to make sure gcc does the right thing.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5384 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/intel')
| -rw-r--r-- | src/mainboard/intel/d945gclf/acpi_tables.c | 7 | ||||
| -rw-r--r-- | src/mainboard/intel/eagleheights/acpi_tables.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c index 5be0c9aef2..b7f92114c5 100644 --- a/src/mainboard/intel/d945gclf/acpi_tables.c +++ b/src/mainboard/intel/d945gclf/acpi_tables.c @@ -31,7 +31,7 @@ #define OLD_ACPI 0 -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); #endif @@ -273,8 +273,9 @@ unsigned long write_acpi_tables(unsigned long start) acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); #if OLD_ACPI for (i=0; i < dsdt->length; i++) { diff --git a/src/mainboard/intel/eagleheights/acpi_tables.c b/src/mainboard/intel/eagleheights/acpi_tables.c index 7a941a5eb6..b4b12b1cbb 100644 --- a/src/mainboard/intel/eagleheights/acpi_tables.c +++ b/src/mainboard/intel/eagleheights/acpi_tables.c @@ -28,7 +28,7 @@ #include <device/pci_ids.h> #include "ioapic.h" -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; unsigned long acpi_fill_mcfg(unsigned long current) { @@ -204,9 +204,10 @@ unsigned long write_acpi_tables(unsigned long start) acpi_create_facs(facs); dsdt = (acpi_header_t *) current; - current += AmlCode.length; + memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); + current += dsdt->length; + memcpy(dsdt, &AmlCode, dsdt->length); ALIGN_CURRENT; - memcpy((void *) dsdt, &AmlCode, AmlCode.length); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); |