diff options
| author | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2009-04-30 22:45:41 +0000 |
| commit | fa12b67771f73f0e7acf2308a13cf33b8c619884 (patch) | |
| tree | 853c5b64915c1b13749561d30bbd34c8d46f1bc4 /src/boot | |
| parent | d233f363c129dae2ba5fd7ac536cf92fb4c2dd6e (diff) | |
| download | coreboot-fa12b67771f73f0e7acf2308a13cf33b8c619884.tar.xz | |
Remove warnings from compilation of the s2892 with and without CBFS.
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
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/hardwaremain.c | 4 | ||||
| -rw-r--r-- | src/boot/selfboot.c | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index d6e88de374..2419dc2134 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -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 diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c index 72fb49fcad..ae1ea0a096 100644 --- a/src/boot/selfboot.c +++ b/src/boot/selfboot.c @@ -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: |