summaryrefslogtreecommitdiff
path: root/src/boot/selfboot.c
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-10-30 02:08:07 +0000
committerMyles Watson <mylesgw@gmail.com>2009-10-30 02:08:07 +0000
commit7943fe61df9e72721a8ceddb0120e4826552d5f9 (patch)
tree21073df83a4ff79a90ddb6fc8ed534a5ccde11aa /src/boot/selfboot.c
parent8f6354b6d3d00a7041f3c770569e797da74acd04 (diff)
downloadcoreboot-7943fe61df9e72721a8ceddb0120e4826552d5f9.tar.xz
Remove some warnings from the tyan s2895.
Declare superio functions to be static and remove duplicates. Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot/selfboot.c')
-rw-r--r--src/boot/selfboot.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c
index bee6135915..6b64f32488 100644
--- a/src/boot/selfboot.c
+++ b/src/boot/selfboot.c
@@ -501,21 +501,21 @@ static int load_self_segments(
memset(middle, 0, end - middle);
}
/* Copy the data that's outside the area that shadows coreboot_ram */
- printk_debug("dest %lx, end %lx, bouncebuffer %lx\n", dest, end, bounce_buffer);
+ printk_debug("dest %p, end %p, bouncebuffer %lx\n", dest, end, bounce_buffer);
if ((unsigned long)end > bounce_buffer) {
if ((unsigned long)dest < bounce_buffer) {
- unsigned long from = dest;
- unsigned long to = lb_start-(bounce_buffer-(unsigned long)dest);
+ unsigned char *from = dest;
+ unsigned char *to = (unsigned char*)(lb_start-(bounce_buffer-(unsigned long)dest));
unsigned long amount = bounce_buffer-(unsigned long)dest;
- printk_debug("move prefix around: from %lx, to %lx, amount: %lx\n", from, to, amount);
+ printk_debug("move prefix around: from %p, to %p, amount: %lx\n", from, to, amount);
memcpy(to, from, amount);
}
if ((unsigned long)end > bounce_buffer + (lb_end - lb_start)) {
unsigned long from = bounce_buffer + (lb_end - lb_start);
unsigned long to = lb_end;
- unsigned long amount = end - from;
+ unsigned long amount = (unsigned long)end - from;
printk_debug("move suffix around: from %lx, to %lx, amount: %lx\n", from, to, amount);
- memcpy(to, from, amount);
+ memcpy((char*)to, (char*)from, amount);
}
}
}