From patchwork Thu Oct 20 19:24:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1692691 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=2oZ9YxpT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MtcxC2w5xz23jc for ; Fri, 21 Oct 2022 06:24:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C445384FB3; Thu, 20 Oct 2022 21:24:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="2oZ9YxpT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52C3684EBF; Thu, 20 Oct 2022 21:24:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2070.outbound.protection.outlook.com [40.107.20.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A118D84FAB for ; Thu, 20 Oct 2022 21:24:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WIctAglGdwGk+z0a4sdW+qY5s1nGQo60bx2O3JUhhq9JdyZ4wN61YlfjHMr3zhRPXD0jW5/sN6bHVDqDAizCBPBB1Rj2M+NkkYdaSZ696gVPV0aKVJzQDGAiHsgIGBijZMddZFIDEYI5owk0mGwtBNdX0lork5fpLdn7433y3UIDf7aw/48vHQCVlh44XBKU4GOSyfrERK1boQAsGqu61QQXUL7lw+X/QWrFD7ibi99gsue5tbbt9gggqSumynZ39KPjyy2jKWE7uzv+3haMjedsvfu9man5ra1RNPmgN0sponOa2VGtUbWXESR7QSgj1W5EIrHHR/dAfa6oAa7m7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VA7kXRYxl8BDRW59iWf/GY1WA2jI3yISFrEDZcnrqp0=; b=CVh6l+JXumg98ti72kmI/WkIsjfh2Pbez0d5fokVHEd+YnoP9Q/qGqjWlldTFqSXesXi+hGHeEsWzCXKYk//VDOTKApzHDv6Kie/Qvt+qMPsHQVF73yrngtI+W0TcHdiX3GdqMIj1Bref9PKSa2hI9sIlEhkOQDVjWF7Bt801+kCEzlMS5xWqbE80Pkl6rsP5S8SxSKL98FK5J9tEpjuVjul0xhmaKFQK1IIko5JBialrqCoUu4wH5SZ1tGWAZeKtSyuNKbaNXhFQf+jDA8shpGYC+gy98wXHgRAW6CoanKlqHlcY5MaJYMzV2GNGpS6o+erKjohmmVGtzbgB0sYNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VA7kXRYxl8BDRW59iWf/GY1WA2jI3yISFrEDZcnrqp0=; b=2oZ9YxpTyF77VvtPeDj55xJGf6ACiqMDu7tEDhol+V6WB+jeovftHS0d49XIwxGMhAmVHQ/SObxmn75N+G7/iM35bTJ+CIrQ+xIrO6d5XK0JVuecTe6pfuX2xXMsdll2z0l8T//otxCpUeJR++2+OJdh/+NgHXqlzDXmZFHgIPBbNaZToiT7K8vGu1KWZSZ+yKbP0vjK/fhmHQdDPRSABWNKXud3oBYpC9SMwAdTRgshBRqZbA5i8sa/kJgPpxWY8wORifKpFbq0GeG8diA/0FVzIxag7tViStjcT+ue3O8rO4p5ZyC3ygPwCc/VuLPpGf/uQfobhkgKdQg88xdkug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by GVXPR03MB8450.eurprd03.prod.outlook.com (2603:10a6:150:4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.26; Thu, 20 Oct 2022 19:24:17 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d%6]) with mapi id 15.20.5723.034; Thu, 20 Oct 2022 19:24:17 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Tom Rini , Rasmus Villemoes , Sean Anderson Subject: [PATCH v2 3/4] cmd: source: Clean up a few lines Date: Thu, 20 Oct 2022 15:24:03 -0400 Message-Id: <20221020192404.2500251-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221020192404.2500251-1-sean.anderson@seco.com> References: <20221020192404.2500251-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR16CA0044.namprd16.prod.outlook.com (2603:10b6:208:234::13) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|GVXPR03MB8450:EE_ X-MS-Office365-Filtering-Correlation-Id: 9be9cb89-868b-4ae5-9ac7-08dab2d0ae28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DbZcUuth2e4rSeUph7R9jmKj3VOuW9Hnx1mBt5YkgonxmT6Yl/dAgP1J8b45Hh2HYjJSU7GERUSGNezBBeBZOq/qzfXg6C34rBnJgzpOcroifjOiB8UO/LCsIQwM8VgA049gXQdv6V1MYdm7M2RDn54qIbOK3lbLwQHPSJt2sSmiQyzl7XqvLDeAxKGFLiO4RTsVyQzS52/qicoB0IjsKGd0U1R3CBHgfN16YmKjOjvQB0J4+xQsb2Kfx+3V6YzeSbsRbw2fGJfw90jRfy+VvoeOR0hFnsTEgwqOTfxplAI81v3uN7BLt7qG5Z8D/FE7dtGQ0jUs2wFSksJJVge/BHBEvKM/z3T53/HtU4DNba3XNtJYlXcUXooXQDfF73dcQkn9l33gPL8HRerwQynk7ErpmlpbZxIcgSe9onwfLnmqQSIyC5cyV2XqNSGezpflDxZBmBYmLD8WRazr4n8FLpVSkzSykQgNLcRpORtNzu4f5gjKkta8/OwiNwScIAGVCpypMwlmZEsWf9pybt82w+ciqFZ7qoQYdnMP1DsOFW3S9hyafyLhHUO6/H4P2e5/WSPJHbAr+x81x1qKiaPMXVjhphYdGhDZa72GRmwKkIBzZbOHPpOO3jJ014dTgjkL5KnF9/OtuTFOghpKoCaZPqezdsuxpgowR3HzegH9vVYmLLK/WVbMVoBgFoLqI6gGvYsPc5TWOKQvhpkP0d5P2+q/lb2Q3JmpNwwKs9EJJgC+FIrhakespIhHOtWW8qcg X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(366004)(39850400004)(136003)(346002)(376002)(451199015)(66556008)(38100700002)(38350700002)(8936002)(107886003)(41300700001)(6666004)(6506007)(52116002)(86362001)(316002)(6512007)(26005)(54906003)(4326008)(6486002)(66946007)(44832011)(478600001)(36756003)(4744005)(83380400001)(8676002)(66476007)(5660300002)(186003)(2616005)(2906002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C64y1HaJeWeSWLvM8ZkfbIG2wXqexLb8C9M1MyUhUWQ2lbnAaZSqLjQDe3vkFJPhfmo2mnPNjSHWzorM5+/KCG6GWICvfZIFmxqinARrSrI+BdYmnPZ2I5rz+que5Gp6ceVAHOeENsv3yhw3/QIYzSv6qhAa5LMuw18Bq1NuTrqCOs7kNy/0pdKYt8CC9ND+x5R8Pci6jeUuO15/XdVh6cgukqcwEHPkub0eIBN2QXftyqa+bT2hnHkL+ESWYNsbR/cSDbcsJMvmWJr69pI5VGk08f+FXfz1fnIIcoCYY0sz/vXmMjG6m6aIUAXTDo9VBenWqG+B6Czo76edWwzf1OSPBWu/nzSP31juIo6XXt0u/R7nL79i9pFNX04VGqjzLsD8UbYXlNISI5ypoORNFSN8dRzOToHFhdzFpltGCuctq8UCuB/CV6Q49yji/7qrB5ywM9MLuo+ZKqJmoYQb5yBQeHExfEBLqyh9VcFeCUD2zhP+cSzT86k46QS5mu+CMR4teiN3MQ4feIyz8F0k+W356teXUWcISc0t5v97o+V/i3p1uLGeybWXWOcYcSa4016OLNFzfkDYcY5oPFvoZ04RSzSaPjJCLTelk/cJ5Lo0oKzL5XPsUR1DGkHrkQaKwDlK4KFFO8T8lgth1eMyTDGqifpB4GRPCqAvaMf0hKAyHTyHlJLulahVlvNleTWj0iUp4ztHRWv2lD2z7sUmD+r+xHPyxxaQ6I6326etP1r4RnaMGF45ziv2ncgQNxJj/ycFzAVRRJ/NhQAKwp4+gv1/XWW4OmI2LzLB9jptt3do23Mre7k4ErGHrQt7+Fs/VuQ5/5ASk+hiLeJTiTg9lluYm2eUsrH8YqhrqHm7AEG1BHGJzlKScp+QSRV61PSgxMLaki5q5jYL98x7Js8F5X+XHdT9HIX9bhrKf9VSP2/03Bvmbyc8bXpNOna8vi6JL639Vf4kdVREbz2no0d03pGtHkdqX8QYxImvi3GcTz8kZfGw2cw/fId0ZuWarRLs0SpZoDW0XO/1kV0HeCNcm2O4vh2B0vurQdNoCOpARXBBAIWtE3RIhMIH/PrSJpI42QNgOWPTtXxGstptCkOtUYvWhXMjCGLrgd8LY1L7+4v+Vmm7WGSK5AK8CRKXYsZHEIUWLrlgcNdfto8QcwI/n1km0Pmqer9q6soFUyoBN5EMau720ZogrH6eOUwc1hgd/cQ3IMFYHo+eUXjxB2/lDLRBaRVxV4J8gxmqJGqwXiGrTPywYDtAy2ozP/qNcS/Mc8+BbiRAPcRJI9WypCAF+kFPW+3vyrh+BifMv6zwHolOQRgQJAm3zNM3rtoZ1BGqSB1nR8zCvHKUdux+9/HeEEoeZJcDLf+Om0wTAd/BBQQPOhjU/yQy7BP+a+HGHot/+7c3zAdKndh9N7uArS75Q/6aBS1QNCbNshDt1ZLOwGWdy1Hx3fb+quXlcmZHuJAqcpAxikXRQi4pFnB4t4kmZ5LDZZu5fsuP/h/lx1ngIOp9vILnJMCrZeX+4t5tqI/Ms6xoPqOwZMwzjWhvzD43BXOR7SP2ILoyu6/kY85b4YHpu3ToxaqzSKh2AtJe8S27og2yUjJBFmTws69fHIHU6A== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be9cb89-868b-4ae5-9ac7-08dab2d0ae28 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 19:24:17.3059 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: X825UnCZWfi5upx0QA/umIply41hZhNRbAYWcFbGyGXIk31V3xNPJGVLU2Mv8/rAG9fjZENnIeaPBM6fMKEm5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR03MB8450 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean This simplifies a few lines and corrects an error message. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) cmd/source.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/source.c b/cmd/source.c index bb98255fe86..f08e6d34172 100644 --- a/cmd/source.c +++ b/cmd/source.c @@ -128,16 +128,14 @@ int image_source_script(ulong addr, const char *fit_uname) } if (!fit_image_check_type (fit_hdr, noffset, IH_TYPE_SCRIPT)) { - puts ("Not a image image\n"); + puts("Not a script image\n"); return 1; } /* verify integrity */ - if (verify) { - if (!fit_image_verify(fit_hdr, noffset)) { - puts ("Bad Data Hash\n"); - return 1; - } + if (verify && !fit_image_verify(fit_hdr, noffset)) { + puts("Bad Data Hash\n"); + return 1; } /* get script subimage data address and length */