diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:38:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:38:54 +0200 |
| commit | d1c6e9e44a7218b390962e90ed462a134564676f (patch) | |
| tree | e16fee6f8aceb8527e51c7b955bddbffa3219bbc /arch/mips/lib/bootm_qemu_mips.c | |
| parent | 76aef69e49318863cb9966f872a80ddb5586d666 (diff) | |
| parent | e034ea3b77baf90ab8dde2c1beeb22704b01fb2d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
* 'master' of git://git.denx.de/u-boot-mips:
MIPS: board.c: move extern declarations to u-boot-mips.h
MIPS: bootm_qemu_mips.c: make checkpatch.pl clean
MIPS: bootm.c: make checkpatch.pl clean
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/mips/lib/bootm_qemu_mips.c')
| -rw-r--r-- | arch/mips/lib/bootm_qemu_mips.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/mips/lib/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c index bb6442ae83d..0815c9cc148 100644 --- a/arch/mips/lib/bootm_qemu_mips.c +++ b/arch/mips/lib/bootm_qemu_mips.c @@ -29,30 +29,31 @@ DECLARE_GLOBAL_DATA_PTR; -int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) +int do_bootm_linux(int flag, int argc, char * const argv[], + bootm_headers_t *images) { - void (*theKernel) (int, char **, char **, int *); - char *bootargs = getenv ("bootargs"); - char *start; - uint len; + void (*theKernel) (int, char **, char **, int *); + char *bootargs = getenv("bootargs"); + char *start; + uint len; /* find kernel entry point */ theKernel = (void (*)(int, char **, char **, int *))images->ep; bootstage_mark(BOOTSTAGE_ID_RUN_OS); - debug ("## Transferring control to Linux (at address %08lx) ...\n", + debug("## Transferring control to Linux (at address %08lx) ...\n", (ulong) theKernel); gd->bd->bi_boot_params = gd->bd->bi_memstart + (16 << 20) - 256; - debug ("%-12s= 0x%08lX\n", "boot_params", (ulong)gd->bd->bi_boot_params); + debug("%-12s= 0x%08lX\n", "boot_params", (ulong)gd->bd->bi_boot_params); /* set Magic */ *(int32_t *)(gd->bd->bi_boot_params - 4) = 0x12345678; /* set ram_size */ *(int32_t *)(gd->bd->bi_boot_params - 8) = gd->ram_size; - start = (char*)gd->bd->bi_boot_params; + start = (char *)gd->bd->bi_boot_params; len = strlen(bootargs); @@ -62,15 +63,16 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima len = images->rd_end - images->rd_start; if (len > 0) { - start += sprintf(start," rd_start=0x%08X rd_size=0x%0X", - (uint) UNCACHED_SDRAM (images->rd_start), + start += sprintf(start, " rd_start=0x%08X rd_size=0x%0X", + (uint) UNCACHED_SDRAM(images->rd_start), (uint) len); } /* we assume that the kernel is in place */ - printf ("\nStarting kernel ...\n\n"); + printf("\nStarting kernel ...\n\n"); + + theKernel(0, NULL, NULL, 0); - theKernel (0, NULL, NULL, 0); /* does not return */ return 1; } |