sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove warnings from compilation of the s2892 with and without CBFS.

Browse Source 
I didn't try to remove "defined but not used" warnings because there are too
many ifdefs to be sure I wouldn't break something.

For shadowed variable declarations I renamed the inner-most variable.  

The one in src/pc80/keyboard.c might need help.  I didn't change the
functionality but it looks like a bug.

I boot tested it on s2892 and abuild tested it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson
2009-04-30 22:45:41 +00:00
parent d233f363c1
commit fa12b67771
27 changed files with 83 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/boot/hardwaremain.c
View File

@@ -99,9 +99,9 @@ void hardwaremain(int boot_complete)
lb_mem = write_tables();
#if CONFIG_CBFS == 1
# if USE_FALLBACK_IMAGE == 1
void (*pl)(void) = cbfs_load_payload(lb_mem, "fallback/payload");
cbfs_load_payload(lb_mem, "fallback/payload");
# else
void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload");
cbfs_load_payload(lb_mem, "normal/payload");
# endif
#else

15
src/boot/selfboot.c
View File

@@ -302,7 +302,6 @@ static int build_self_segment_list(
{
struct segment *new;
struct segment *ptr;
u8 *data;
int datasize;
struct cbfs_payload_segment *segment, *first_segment;
memset(head, 0, sizeof(*head));
@@ -352,7 +351,7 @@ static int build_self_segment_list(
case PAYLOAD_SEGMENT_ENTRY:
printk_info("Entry %p\n", (void *) ntohl((u32) segment->load_addr));
*entry = (void *) ntohl((u32) segment->load_addr);
*entry = ntohl((u32) segment->load_addr);
return 1;
}
segment++;
@@ -392,15 +391,13 @@ static int load_self_segments(
offset = 0;
for(ptr = head->next; ptr != head; ptr = ptr->next) {
unsigned long skip_bytes, read_bytes;
unsigned char *dest, *middle, *end, *src;
byte_offset_t result;
printk_debug("Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n",
ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz);
/* Compute the boundaries of the segment */
dest = (unsigned char *)(ptr->s_dstaddr);
src = ptr->s_srcaddr;
src = (unsigned char *)(ptr->s_srcaddr);
/* Copy data from the initial buffer */
if (ptr->s_filesz) {
@@ -451,13 +448,11 @@ static int load_self_segments(
}
}
return 1;
out:
return 0;
}
int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
{
void *entry;
u32 entry=0;
struct segment head;
unsigned long bounce_buffer;
@@ -481,11 +476,11 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
/* Reset to booting from this image as late as possible */
boot_successful();
printk_debug("Jumping to boot code at %p\n", entry);
printk_debug("Jumping to boot code at %x\n", entry);
post_code(0xfe);
/* Jump to kernel */
jmp_to_elf_entry(entry, bounce_buffer);
jmp_to_elf_entry((void*)entry, bounce_buffer);
return 1;
out: