From patchwork Sun Jun 3 22:04:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Schwierzeck X-Patchwork-Id: 162603 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 CF1D7B6FF4 for ; Mon, 4 Jun 2012 08:04:40 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 334CB280AB; Mon, 4 Jun 2012 00:04:31 +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 SPwforyS5yxA; Mon, 4 Jun 2012 00:04:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 32891280AD; Mon, 4 Jun 2012 00:04:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13AC82809B for ; Mon, 4 Jun 2012 00:04:22 +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 IjCoY5mjxX64 for ; Mon, 4 Jun 2012 00:04:21 +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-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by theia.denx.de (Postfix) with ESMTPS id 27F862809A for ; Mon, 4 Jun 2012 00:04:19 +0200 (CEST) Received: by wibhr14 with SMTP id hr14so1945443wib.9 for ; Sun, 03 Jun 2012 15:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=lob0oVmcLav50W7+GIhIkWjOR1n4RQKG9dkqeFevHTo=; b=LTknm/dBAsjB18wmCuRDeOAupiy45/D0X+6OjyCEmJCEz1Nl1iDtqGNpJqxFVQKqci gHes6n6TJYAP8KJdiYsnzu2pHPur6zBO4aXvhGPiAgocP31nKaGQxNx1p9T18jUTuy0h bAiRWQVb+gWX89HFAF3O1nQ2JJRtWnvfnHu3KZ3CCF9DOW3owUzPeekyEccz0kcqhRba 9b8iRZkWwKW8v1ScNkf8MHp+9fPNLJTfmnXBegeiDcbLe5dttP3ukGRRARX/CsmOfkuL 4VG6jTh2X+joZr5aPekVqHlJQJzkwwUD5dbb1gPKSKM21KezOgYC84J2Rx6DgijW6/4L R65Q== Received: by 10.216.135.146 with SMTP id u18mr9583952wei.5.1338761059199; Sun, 03 Jun 2012 15:04:19 -0700 (PDT) Received: from workstation.sas.sys.sphairon.com (dslb-094-222-047-036.pools.arcor-ip.net. [94.222.47.36]) by mx.google.com with ESMTPS id q6sm16128318wiy.0.2012.06.03.15.04.17 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 03 Jun 2012 15:04:18 -0700 (PDT) From: Daniel Schwierzeck To: u-boot@lists.denx.de Date: Mon, 4 Jun 2012 00:04:08 +0200 Message-Id: <1338761049-27533-2-git-send-email-daniel.schwierzeck@googlemail.com> X-Mailer: git-send-email 1.7.10 Subject: [U-Boot] [PATCH] MIPS: bootm_qemu_mips.c: make checkpatch.pl clean 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 Signed-off-by: Daniel Schwierzeck --- arch/mips/lib/bootm_qemu_mips.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/mips/lib/bootm_qemu_mips.c b/arch/mips/lib/bootm_qemu_mips.c index bb6442a..0815c9c 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; }