From patchwork Mon Apr 30 08:32:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 906558 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tj/0t2SF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40ZJ39062Lz9s06 for ; Mon, 30 Apr 2018 18:43:16 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BC12CC21F77; Mon, 30 Apr 2018 08:42:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3F0DFC21FC3; Mon, 30 Apr 2018 08:35:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AA8BDC21F0B; Mon, 30 Apr 2018 08:34:02 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id 725CCC21F22 for ; Mon, 30 Apr 2018 08:33:54 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id t11so11756822wmt.0 for ; Mon, 30 Apr 2018 01:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CpPA7fSgt3uAWa5AtciIIN7RwG53NrxrVnwPqw6iW3E=; b=tj/0t2SF0fODXJ/ZDMlvytM0vdJfuyz2xAD/TyyhDRiYXgP4X7kfxV8TFmt6boBpkI TGur6W7sNW1BEdYB1ZcFMpVc78c0J7TjOc/pi5la2FTDdYPdTBFzDQusOLJqFgSskJF3 qExTIzWExmKAsP3xB5hTmNerOz1KuRMTJ0ntm7jFvPlxu358t7a6WTiBLyhBM4kOPibu NmuZ1dSzAhPtldFpDAqevakz6DV5/T84wGyRhxg8zPboPkUCDvX9Bo6Y6Ss5Z6irvpM+ sJAN/0AD8XbKpzw3cCImrYjkEjNSk4GKOHTozNBRb/R/8P3Qw0tt8PBHgg7+rSwZw0ib FYXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CpPA7fSgt3uAWa5AtciIIN7RwG53NrxrVnwPqw6iW3E=; b=XMKgcdasr7GePltVAAZKhm190lNK+oZXTP+0oG8D4ZhuistqvvHlLeIJ9oapr9/LxJ hQHZf+Q581nscaCAQ/A0WR4ApSUtAT6ba1traHRbDo0FoRcuvXFiXcw1jFeEHakHGKjW d91UrhYDFEiWEmBKjjPqjYMYcq4gjlT6+S59Y8PG3g5vu2KYcCx3D3pLBWhp20VtwVH/ bOycB9L+QzmufLQsDustPLODStaKcukrjnhNdKFT6O1J1Jq8lUWRlLIOwvbEVZrJpw3c Ftui7ubEhXecXfvodOiXPv2vyhAfmKhOQiniR0XMTHoSfpxJKH9/LsvMmLVNXQM6dBDS FzIQ== X-Gm-Message-State: ALQs6tAumElrn7yG5FcWIroXItXoybQ98m+iLq3joNO3FBpeYNVTafZa STiSWkcGga/1ZLvu//gltx8Kp3Fy5bI= X-Google-Smtp-Source: AB8JxZoPiz7K5o7+rLj/TP/hSN8Z/1ewHJQDXqEyB5ZArowUXn4OlgBV6qjLm45a7sD0y0mKKo0Lgg== X-Received: by 10.28.23.15 with SMTP id 15mr6927693wmx.90.1525077233889; Mon, 30 Apr 2018 01:33:53 -0700 (PDT) Received: from localhost.localdomain (193.164.125.18.ip.redstone-isp.net. [193.164.125.18]) by smtp.gmail.com with ESMTPSA id v12-v6sm5766947wrm.68.2018.04.30.01.33.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Apr 2018 01:33:53 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Date: Mon, 30 Apr 2018 08:32:53 +0000 Message-Id: <1525077174-6211-20-git-send-email-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525077174-6211-1-git-send-email-alex.kiernan@gmail.com> References: <1525077174-6211-1-git-send-email-alex.kiernan@gmail.com> Cc: Jocelyn Bohr Subject: [U-Boot] [RFC PATCH v2 19/20] fastboot: Add missing newlines X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add newlines so we format our output correctly. Signed-off-by: Alex Kiernan Acked-by: Joe Hershberger Reviewed-by: Jocelyn Bohr --- Changes in v2: None drivers/fastboot/fb_mmc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 416f309..2f67965 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -154,7 +154,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, sector_size = info->blksz; hdr_sectors = DIV_ROUND_UP(sizeof(struct andr_img_hdr), sector_size); if (hdr_sectors == 0) { - pr_err("invalid number of boot sectors: 0"); + pr_err("invalid number of boot sectors: 0\n"); fastboot_fail("invalid number of boot sectors: 0", response); return 0; } @@ -162,7 +162,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, /* Read the boot image header */ res = blk_dread(dev_desc, info->start, hdr_sectors, (void *)hdr); if (res != hdr_sectors) { - pr_err("cannot read header from boot partition"); + pr_err("cannot read header from boot partition\n"); fastboot_fail("cannot read header from boot partition", response); return 0; @@ -171,7 +171,7 @@ static lbaint_t fb_mmc_get_boot_header(struct blk_desc *dev_desc, /* Check boot header magic string */ res = android_image_check_header(hdr); if (res != 0) { - pr_err("bad boot image magic"); + pr_err("bad boot image magic\n"); fastboot_fail("boot partition not initialized", response); return 0; } @@ -210,7 +210,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, /* Get boot partition info */ res = part_get_info_by_name(dev_desc, BOOT_PARTITION_NAME, &info); if (res < 0) { - pr_err("cannot find boot partition"); + pr_err("cannot find boot partition\n"); fastboot_fail("cannot find boot partition", response); return -1; } @@ -222,14 +222,14 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, /* Read boot image header */ hdr_sectors = fb_mmc_get_boot_header(dev_desc, &info, hdr, response); if (hdr_sectors == 0) { - pr_err("unable to read boot image header"); + pr_err("unable to read boot image header\n"); fastboot_fail("unable to read boot image header", response); return -1; } /* Check if boot image has second stage in it (we don't support it) */ if (hdr->second_size > 0) { - pr_err("moving second stage is not supported yet"); + pr_err("moving second stage is not supported yet\n"); fastboot_fail("moving second stage is not supported yet", response); return -1; @@ -248,7 +248,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, res = blk_dread(dev_desc, ramdisk_sector_start, ramdisk_sectors, ramdisk_buffer); if (res != ramdisk_sectors) { - pr_err("cannot read ramdisk from boot partition"); + pr_err("cannot read ramdisk from boot partition\n"); fastboot_fail("cannot read ramdisk from boot partition", response); return -1; @@ -258,7 +258,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, hdr->kernel_size = download_bytes; res = blk_dwrite(dev_desc, info.start, hdr_sectors, (void *)hdr); if (res == 0) { - pr_err("cannot writeback boot image header"); + pr_err("cannot writeback boot image header\n"); fastboot_fail("cannot write back boot image header", response); return -1; } @@ -270,7 +270,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, res = blk_dwrite(dev_desc, kernel_sector_start, kernel_sectors, download_buffer); if (res == 0) { - pr_err("cannot write new kernel"); + pr_err("cannot write new kernel\n"); fastboot_fail("cannot write new kernel", response); return -1; } @@ -282,7 +282,7 @@ static int fb_mmc_update_zimage(struct blk_desc *dev_desc, res = blk_dwrite(dev_desc, ramdisk_sector_start, ramdisk_sectors, ramdisk_buffer); if (res == 0) { - pr_err("cannot write back original ramdisk"); + pr_err("cannot write back original ramdisk\n"); fastboot_fail("cannot write back original ramdisk", response); return -1; } @@ -396,21 +396,21 @@ void fb_mmc_erase(const char *cmd, char *response) struct mmc *mmc = find_mmc_device(CONFIG_FASTBOOT_FLASH_MMC_DEV); if (mmc == NULL) { - pr_err("invalid mmc device"); + pr_err("invalid mmc device\n"); fastboot_fail("invalid mmc device", response); return; } dev_desc = blk_get_dev("mmc", CONFIG_FASTBOOT_FLASH_MMC_DEV); if (!dev_desc || dev_desc->type == DEV_TYPE_UNKNOWN) { - pr_err("invalid mmc device"); + pr_err("invalid mmc device\n"); fastboot_fail("invalid mmc device", response); return; } ret = part_get_info_by_name_or_alias(dev_desc, cmd, &info); if (ret < 0) { - pr_err("cannot find partition: '%s'", cmd); + pr_err("cannot find partition: '%s'\n", cmd); fastboot_fail("cannot find partition", response); return; } @@ -429,7 +429,7 @@ void fb_mmc_erase(const char *cmd, char *response) blks = fb_mmc_blk_write(dev_desc, blks_start, blks_size, NULL); if (blks != blks_size) { - pr_err("failed erasing from device %d", dev_desc->devnum); + pr_err("failed erasing from device %d\n", dev_desc->devnum); fastboot_fail("failed erasing from device", response); return; }