From 7943fe61df9e72721a8ceddb0120e4826552d5f9 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Fri, 30 Oct 2009 02:08:07 +0000 Subject: Remove some warnings from the tyan s2895. Declare superio functions to be static and remove duplicates. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/boot/selfboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/boot') 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); } } } -- cgit v1.2.3