sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

microblaze: bootm: Fix coding style issues 

Prepare place for new patch.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2013-05-02 12:51:48 +02:00
parent fe8e4dbad1
commit 1e71fa4369
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/microblaze/lib/bootm.c
View File

@ -32,10 +32,11 @@
DECLARE_GLOBAL_DATA_PTR; 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)
{ {
/* First parameter is mapped to $r5 for kernel boot args */ /* First parameter is mapped to $r5 for kernel boot args */
void (*theKernel) (char *, ulong, ulong); void (*thekernel) (char *, ulong, ulong);
char *commandline = getenv("bootargs"); char *commandline = getenv("bootargs");
ulong rd_data_start, rd_data_end; ulong rd_data_start, rd_data_end;
@ -51,7 +52,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
of_flat_tree = images->ft_addr; of_flat_tree = images->ft_addr;
#endif #endif
theKernel = (void (*)(char *, ulong, ulong))images->ep; thekernel = (void (*)(char *, ulong, ulong))images->ep;
/* find ramdisk */ /* find ramdisk */
ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE, ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE,
@ -64,9 +65,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
if (!of_flat_tree && argc > 3) if (!of_flat_tree && argc > 3)
of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16); of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16);
#ifdef DEBUG #ifdef DEBUG
printf ("## Transferring control to Linux (at address 0x%08lx) " \ printf("## Transferring control to Linux (at address 0x%08lx) ",
"ramdisk 0x%08lx, FDT 0x%08lx...\n", (ulong)thekernel);
(ulong) theKernel, rd_data_start, (ulong) of_flat_tree); printf("ramdisk 0x%08lx, FDT 0x%08lx...\n",
rd_data_start, (ulong) of_flat_tree);
#endif #endif
#ifdef XILINX_USE_DCACHE #ifdef XILINX_USE_DCACHE
@ -78,7 +80,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
* r6: pointer to ramdisk * r6: pointer to ramdisk
* r7: pointer to the fdt, followed by the board info data * r7: pointer to the fdt, followed by the board info data
*/ */
theKernel (commandline, rd_data_start, (ulong) of_flat_tree); thekernel(commandline, rd_data_start, (ulong)of_flat_tree);
/* does not return */ /* does not return */
return 1; return 1;