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/amd/serengeti_cheetah/acpi_tables.c | |
| 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/amd/serengeti_cheetah/acpi_tables.c')
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c index c7103f1ad9..e225aee991 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c @@ -38,11 +38,11 @@ static void dump_mem(u32 start, u32 end) } #endif -extern const acpi_header_t AmlCode; +extern const unsigned char AmlCode[]; #if CONFIG_ACPI_SSDTX_NUM >= 1 -extern const acpi_header_t AmlCode_ssdt2; -extern const acpi_header_t AmlCode_ssdt3; -extern const acpi_header_t AmlCode_ssdt4; +extern const unsigned char AmlCode_ssdt2[]; +extern const unsigned char AmlCode_ssdt3[]; +extern const unsigned char AmlCode_ssdt4[]; #endif #define IO_APIC_ADDR 0xfec00000UL @@ -194,7 +194,7 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *dsdt; acpi_header_t *ssdt; acpi_header_t *ssdtx; - acpi_header_t const *p; + void *p; int i; @@ -285,8 +285,9 @@ unsigned long write_acpi_tables(unsigned long start) default: continue; } - current += p->length; - memcpy((void *)ssdtx, (void *)p, ((acpi_header_t *)p)->length); + memcpy(ssdtx, p, sizeof(acpi_header_t)); + current += ssdtx->length; + memcpy(ssdtx, p, ssdtx->length); update_ssdtx((void *)ssdtx, i); ssdtx->checksum = 0; ssdtx->checksum = acpi_checksum((u8 *)ssdtx, ssdtx->length); @@ -303,8 +304,9 @@ unsigned long write_acpi_tables(unsigned long start) /* DSDT */ printk(BIOS_DEBUG, "ACPI: * DSDT at %lx\n", current); 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); printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); /* FDAT */ |