summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2013-01-11 10:41:42 -0800
committerRonald G. Minnich <rminnich@gmail.com>2013-01-11 19:56:43 +0100
commitb8ad2244686a801a96326d8075526d9b701ad982 (patch)
treef7cf4e7229880a3a8403fa27415ba44d8c6cb8d7 /src/arch
parentea22796edaa5c51271ea98590d22eea3976cadba (diff)
downloadcoreboot-b8ad2244686a801a96326d8075526d9b701ad982.tar.xz
cbmem: replace pointer type by uint64_t
Since coreboot is compiled into 32bit code, and userspace might be 32 or 64bit, putting a pointer into the coreboot table is not viable. Instead, use a uint64_t, which is always big enough for a pointer, even if we decide to move to a 64bit coreboot at some point. Change-Id: Ic974cdcbc9b95126dd1e07125f3e9dce104545f5 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/2135 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/boot/coreboot_table.c2
-rw-r--r--src/arch/x86/boot/coreboot_table.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/armv7/boot/coreboot_table.c b/src/arch/armv7/boot/coreboot_table.c
index 9f67da0e1b..86a004d887 100644
--- a/src/arch/armv7/boot/coreboot_table.c
+++ b/src/arch/armv7/boot/coreboot_table.c
@@ -251,7 +251,7 @@ static void add_cbmem_pointers(struct lb_header *header)
}
cbmem_ref->tag = sid->table_tag;
cbmem_ref->size = sizeof(*cbmem_ref);
- cbmem_ref->cbmem_addr = cbmem_addr;
+ cbmem_ref->cbmem_addr = (unsigned long)cbmem_addr;
}
}
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index 18ec6d8c3c..8dccd77287 100644
--- a/src/arch/x86/boot/coreboot_table.c
+++ b/src/arch/x86/boot/coreboot_table.c
@@ -251,7 +251,7 @@ static void add_cbmem_pointers(struct lb_header *header)
}
cbmem_ref->tag = sid->table_tag;
cbmem_ref->size = sizeof(*cbmem_ref);
- cbmem_ref->cbmem_addr = cbmem_addr;
+ cbmem_ref->cbmem_addr = (unsigned long)cbmem_addr;
}
}