summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>2012-06-03 23:46:04 +0200
committerDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>2012-06-03 23:46:04 +0200
commited53010441c1aa29b127aecf57b1d83d23e63f8d (patch)
tree2b0af21f7fa990196bb0e7825be527fa91d61bb0 /arch/mips
parente51a6b7a6c09cb4e7ce792ac38d413dba9367b70 (diff)
downloadtalos-obmc-uboot-ed53010441c1aa29b127aecf57b1d83d23e63f8d.tar.gz
talos-obmc-uboot-ed53010441c1aa29b127aecf57b1d83d23e63f8d.zip
MIPS: bootm_qemu_mips.c: make checkpatch.pl clean
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/lib/bootm_qemu_mips.c26
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 bb6442ae83..0815c9cc14 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;
}
OpenPOWER on IntegriCloud