From patchwork Fri Oct 10 14:21:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 398591 X-Patchwork-Delegate: sjg@chromium.org 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 086871400B2 for ; Sat, 11 Oct 2014 01:23:18 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 589FAA7496; Fri, 10 Oct 2014 16:23:02 +0200 (CEST) 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 mdOzBn3iG+wJ; Fri, 10 Oct 2014 16:23:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 66AAEA74A0; Fri, 10 Oct 2014 16:22:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 36973A7439 for ; Fri, 10 Oct 2014 16:22:34 +0200 (CEST) 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 6GSTwiiueGlE for ; Fri, 10 Oct 2014 16:22:34 +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-pa0-f73.google.com (mail-pa0-f73.google.com [209.85.220.73]) by theia.denx.de (Postfix) with ESMTPS id 8BF02A73ED for ; Fri, 10 Oct 2014 16:22:30 +0200 (CEST) Received: by mail-pa0-f73.google.com with SMTP id et14so343713pad.4 for ; Fri, 10 Oct 2014 07:22:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cvWi/rZXfnjTD0ZFPKsnvA8wgsS6loWEmTKrEF46GLE=; b=cYiD5gm1h2EeS1Cnk9xk5m+dvieZrJWTKfXUu3g9yxLsuH7ndteUmtJvufKksZTqwj dmNSvORRD5nqBZldFRret8XlPN0DKfbKziCffhYMtNcTlDe+HEprSqEtdpAhbnquk22l 2OrQ2XksJiYMKKOFojWXnbWc/SQAs4/0D82UyWHfoxFgqrudGKfpmOIrdaB0AT6QpZjL YcuR1r0h274u49AZONH3U/wL6KmXmFAFoib6P44UjV6EY4fs+OsIXRYtD4BPdi3sVhRe OpmXHA4NCPeDzlvNHRMfZRNHMWFqqp5towcqVXqVj7aByQqpRSKDKK23kGoelNUqzYT7 sQAw== X-Gm-Message-State: ALoCoQk3qXEXeejDX93AWY1UgY6B2ko1ZZeKzKt8sAJhIgE0XmKD9ZY5bn2AutHNV9FjZmuSQtx5 X-Received: by 10.66.192.201 with SMTP id hi9mr3064331pac.27.1412950948894; Fri, 10 Oct 2014 07:22:28 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id n22si328258yhd.1.2014.10.10.07.22.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Oct 2014 07:22:28 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id nMbzFD0k.1; Fri, 10 Oct 2014 07:22:28 -0700 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 1BED82213D2; Fri, 10 Oct 2014 08:22:28 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 10 Oct 2014 08:21:59 -0600 Message-Id: <1412950921-20052-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412950921-20052-1-git-send-email-sjg@chromium.org> References: <1412950921-20052-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ Subject: [U-Boot] [PATCH 08/10] x86: Correct a few progress message nits X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 We should use puts() instead of printf() where possible. Also clarify the setup.bin message. Signed-off-by: Simon Glass --- arch/x86/lib/bootm.c | 2 +- arch/x86/lib/zimage.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index 46a1d96..86030cf 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -121,7 +121,7 @@ static int boot_prep_linux(bootm_headers_t *images) } else if (images->ep) { cmd_line_dest = (void *)images->ep + COMMAND_LINE_OFFSET; } else { - printf("## Kernel loading failed (no setup) ...\n"); + printf("## Kernel loading failed (missing x86 kernel setup) ...\n"); goto error; } diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index aa5597c..566b048 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -307,12 +307,12 @@ int do_zboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) base_ptr = load_zimage(bzImage_addr, bzImage_size, &load_address); if (!base_ptr) { - printf("## Kernel loading failed ...\n"); + puts("## Kernel loading failed ...\n"); return -1; } if (setup_zimage(base_ptr, (char *)base_ptr + COMMAND_LINE_OFFSET, 0, initrd_addr, initrd_size)) { - printf("Setting up boot parameters failed ...\n"); + puts("Setting up boot parameters failed ...\n"); return -1; }