summaryrefslogtreecommitdiff
path: root/src/mainboard/kontron
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2010-04-09 03:41:23 +0000
committerMyles Watson <mylesgw@gmail.com>2010-04-09 03:41:23 +0000
commitae60855f918dfc7f3f560528296fdd2d4b4ca791 (patch)
tree03d6d96f688b0c70756520413ee88cca59b2f122 /src/mainboard/kontron
parente64b63750f029dac66902dee8cf6a7cf82ba44a3 (diff)
downloadcoreboot-ae60855f918dfc7f3f560528296fdd2d4b4ca791.tar.xz
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/kontron')
-rw-r--r--src/mainboard/kontron/986lcd-m/acpi_tables.c7
-rw-r--r--src/mainboard/kontron/kt690/acpi_tables.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
index 1c6cc9d3ee..55f02b10c2 100644
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c
@@ -29,7 +29,7 @@
#include <cpu/x86/msr.h>
#include "dmi.h"
-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
@@ -204,8 +204,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);
ALIGN_CURRENT;
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index 7be5e990bc..5ecb613b7b 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -57,7 +57,7 @@ static void dump_mem(u32 start, u32 end)
}
#endif
-extern const acpi_header_t AmlCode;
+extern const unsigned char AmlCode[];
#define IO_APIC_ADDR 0xfec00000UL
@@ -187,8 +187,9 @@ unsigned long write_acpi_tables(unsigned long start)
/* DSDT */
printk(BIOS_DEBUG, "ACPI: * DSDT\n");
dsdt = (acpi_header_t *) current;
- 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);
/* FADT */
printk(BIOS_DEBUG, "ACPI: * FADT\n");