From patchwork Tue Apr 24 17:46:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 903752 X-Patchwork-Delegate: sbabic@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=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="CAi9B6zp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40VrjW3GDbz9s0v for ; Wed, 25 Apr 2018 04:01:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 16CB5C21F05; Tue, 24 Apr 2018 17:55:13 +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=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 2A407C21F9D; Tue, 24 Apr 2018 17:48:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 46F4EC21FBF; Tue, 24 Apr 2018 17:46:53 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id 69E98C21F21 for ; Tue, 24 Apr 2018 17:46:53 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t67so2684632wmt.0 for ; Tue, 24 Apr 2018 10:46:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qfCt0B89/iYgPDCAEauK+XI6HnI+WNCRSLy8+O4u3yg=; b=CAi9B6zp18UaNtIwi5zThDSgYiqQ6LRqKoDZRGBnpl176eeER58Y04Rw4kcG18SzNz oAeLDNCpTegfzYk0/JXEOdibYQ6h8QYIWMuvd79kxCp1mjMDcJ2LCa6YfS647URe579g o3+imbeQHhJNUpNacc0y6VQOVHwXUFyDiCSuU= 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=qfCt0B89/iYgPDCAEauK+XI6HnI+WNCRSLy8+O4u3yg=; b=j6N54gemoK12hS4ZcFaPnh2DTHKgDVPcB+rPPsWUXT4ggwPEM1pjxTt50B3fjP1aja ECkoLCfZKcCQvT/HXBshLaoWHMZ4qK00wtgoWu0lvt/GjsBeuaAuLF045LO6nwgx8eTd zqPv2pe4Byl9omvmd11y28H+nv+TK9H1B6DLKUWMvbLFv3ugvpixG1ra4bi5zDeTnUAl rt8bh0JxfiueA7Wp+kxgfyIkka7skrVJ8JZpG3TbArd5JG+dO7KjJkk7qjwNlIr5KYkE mw2U08wwCP6wwjkerw655rkRn0fj7/tSkhPbd0iDfLrck9Rk6IRky9lrL1bciVREnFlo GPFA== X-Gm-Message-State: ALQs6tCvZTBw0NvpUAPbyL6kO6wJZn7boUe4pAMlbecTizHWkR1gL2Ju g+yQIEoUluI39qoiZ81iImiQtbYChgk= X-Google-Smtp-Source: AIpwx49/IUfYa9VXkhk/Whej9WYJN58SQ9AamaJmpBROlDtuXxbeHuXZ8TEV+/ufBnYDXQdhukIg+Q== X-Received: by 10.80.149.219 with SMTP id x27mr34730589eda.99.1524592012900; Tue, 24 Apr 2018 10:46:52 -0700 (PDT) Received: from event-horizon.net ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id e6sm6443087eds.20.2018.04.24.10.46.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 10:46:52 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, sbabic@denx.de, fabio.estevam@nxp.com, breno.lima@nxp.com Date: Tue, 24 Apr 2018 18:46:30 +0100 Message-Id: <20180424174647.11840-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424174647.11840-1-bryan.odonoghue@linaro.org> References: <20180424174647.11840-1-bryan.odonoghue@linaro.org> Subject: [U-Boot] [PATCH v4 01/18] tools/imximage: Fix fruity lack of 0x prefix in DCD Blocks 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" commit 8519c9c98ad6 ("tools/imximage: use 0x prefix in HAB Blocks line") adds an 0x prefix to each HAB Block number to make it easier for host tools to process the HAB Block output, however it neglects to apply the same prefix to the DCD Blocks directive. You need the DCD Blocks directive if you are making a u-boot recovery image which the BootROM will accept via the USB upload utility. This disparity results in a fruity output like this with HAB Blocks prefixed but DCD Blocks not prefixed - which is pretty inconsistent. This patch fixes the difference assuming the original commit was a legitimate change. Old: Image Type: Freescale IMX Boot Image Image Ver: 2 (i.MX53/6/7 compatible) Mode: DCD Data Size: 430080 Bytes = 420.00 KiB = 0.41 MiB Load Address: 877ff420 Entry Point: 87800000 HAB Blocks: 0x877ff400 0x00000000 0x00066c00 DCD Blocks: 00910000 0000002c 000001d4 New: Image Type: Freescale IMX Boot Image Image Ver: 2 (i.MX53/6/7 compatible) Mode: DCD Data Size: 430080 Bytes = 420.00 KiB = 0.41 MiB Load Address: 877ff420 Entry Point: 87800000 HAB Blocks: 0x877ff400 0x00000000 0x00066c00 DCD Blocks: 0x00910000 0x0000002c 0x000001d4 Signed-off-by: Bryan O'Donoghue Cc: Rasmus Villemoes Cc: Fabio Estevam Cc: Breno Lima Cc: Stefano Babic Reviewed-by: Fabio Estevam --- tools/imximage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/imximage.c b/tools/imximage.c index 6dabb13520..6f16d45351 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -520,7 +520,7 @@ static void print_hdr_v2(struct imx_header *imx_hdr) (uint32_t)fhdr_v2->self, 0, hdr_v2->boot_data.size - imximage_ivt_offset - imximage_csf_size); - printf("DCD Blocks: 00910000 %08x %08x\n", + printf("DCD Blocks: 0x00910000 0x%08x 0x%08x\n", offs, be16_to_cpu(dcdlen)); } } else {