From patchwork Fri May 3 07:26:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 241234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 466AB2C00C4 for ; Fri, 3 May 2013 17:27:15 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D00694A39A; Fri, 3 May 2013 09:27:13 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2Kjvj4cdUEVB; Fri, 3 May 2013 09:27:13 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3E764A386; Fri, 3 May 2013 09:27:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5A3694A388 for ; Fri, 3 May 2013 09:27:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LbHBusWEkrBP for ; Fri, 3 May 2013 09:27:01 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by theia.denx.de (Postfix) with ESMTPS id 5E99C4A33F for ; Fri, 3 May 2013 09:26:55 +0200 (CEST) Received: by mail-ea0-f173.google.com with SMTP id d10so596594eaj.4 for ; Fri, 03 May 2013 00:26:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :content-type:x-gm-message-state; bh=7vMbfiYezRWo07aRa6V2rdRCD3sUCulpvFjS/zOaVWo=; b=APe7t75F3N9YEYGaMARc1tQRxPyZqV87CDSQ/ejpJSf7n+eCPRYp2zW0VWk1D0ktfR pXy99eFYVqzrbPj+wmNbIqm4UChZ8WL2N/y81qUOtOIudlW+ZuGSf6j6TSAb8CLA7VOb fy2uCGB3sArLyJj716FB55SRrt6x8V8IrZL8D7BK+ilvkyuqsrWnthG9dC6uybzweH6/ n518m7TxDsDvtp8MAjFWtfDZdoT2119TpfZNKbx936FGx3wUw6Tummw1CrBWMe0l5lTi AYis4zoo4NH31wTV2h/3aGPadA5zHa3VS0gD3jPnf+koRPYXfhOhNojORdOJ5zq15n96 hEpQ== X-Received: by 10.15.41.2 with SMTP id r2mr28261804eev.23.1367566015021; Fri, 03 May 2013 00:26:55 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id c44sm10717655eeb.4.2013.05.03.00.26.53 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 03 May 2013 00:26:54 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Michal Simek , Tom Rini Date: Fri, 3 May 2013 09:26:52 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.1 X-Gm-Message-State: ALoCoQn7h04/+OL9LTseXio7n1nTuCf+eSLrJ0q1YbDm4HeWTD8/iy8KshvG/52KO48swwtA7RPA Cc: Peter Crosthwaite , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH 1/2] microblaze: bootm: Fix coding style issues X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Prepare place for new patch. Signed-off-by: Michal Simek --- arch/microblaze/lib/bootm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 1.8.2.1 diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 66d21f4..b992a4d 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -32,11 +32,12 @@ 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 */ - void (*theKernel) (char *, ulong, ulong); - char *commandline = getenv ("bootargs"); + void (*thekernel) (char *, ulong, ulong); + char *commandline = getenv("bootargs"); ulong rd_data_start, rd_data_end; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) @@ -51,10 +52,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima of_flat_tree = images->ft_addr; #endif - theKernel = (void (*)(char *, ulong, ulong))images->ep; + thekernel = (void (*)(char *, ulong, ulong))images->ep; /* find ramdisk */ - ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE, + ret = boot_get_ramdisk(argc, argv, images, IH_ARCH_MICROBLAZE, &rd_data_start, &rd_data_end); if (ret) return 1; @@ -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) of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16); #ifdef DEBUG - printf ("## Transferring control to Linux (at address 0x%08lx) " \ - "ramdisk 0x%08lx, FDT 0x%08lx...\n", - (ulong) theKernel, rd_data_start, (ulong) of_flat_tree); + printf("## Transferring control to Linux (at address 0x%08lx) ", + (ulong)thekernel); + printf("ramdisk 0x%08lx, FDT 0x%08lx...\n", + rd_data_start, (ulong) of_flat_tree); #endif #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 * 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 */ return 1;