From patchwork Thu Oct 13 18:27:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1689681 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=ral6sIKW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4MpJ1T5btKz23k6 for ; Fri, 14 Oct 2022 05:28:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5C5A84F0B; Thu, 13 Oct 2022 20:28:10 +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="ral6sIKW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C2AFA84BB9; Thu, 13 Oct 2022 20:28:03 +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 EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) (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 75C8084E91 for ; Thu, 13 Oct 2022 20:27:59 +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=JnPgAlhv/SL4irnMXjHGbQTy6nUMDDZOS4JUcBUbaGFMgr56VEDFXcdOIC7/tuRBS0C1IK4dRhyKZmGZfhgTvMqFC85pKPxoVMoqm55H8JekqAKZqutgm+AtCuXDnppdAeOxz1L0kqVuuEq+fSILw3ceIRkE/gGrdhJ4MyuF6yHrjqxb9kirB4ubANsEWuAfGJObUJ8TBVh/Z4fUoaaCyhPG6KbVtj9SIuXKz7iX4xRLgdLYj4AAX6LHKQIg02/Ms3wN0ycSHRn7a792w++x4UnF7+Mh2VrkqddwKMOsGsGjEls8VoRoKmaLOlGGCKPD5BYUHPjqHWMu+17JLbQWuQ== 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=dtfU9oRlwVeRl2CVxxLaJpoZFFiVMA5cno4HBQLLR7U=; b=Mmn5mJukguCr1UhraYWllWvUzp9JXlVOyz0Xza44VAqg7SrNlyDn7Wfi6HhLplUFVkaN/0lmVH7thUJCpXGHUninvYGhB6E9p2cUaJAzdwsFA85be1TYX2hRyiz6OMscYiJLzLvK92lNgyFBoMJarPuA9nV7HsYCPiUFAjTO0uYIcJAW+7o/VXQAVxImrUIZZZiGv/98oZljFmvdTPsTLiu6B4bf+a01W6wRj3Itj2VUlqq0Z6z+uOxAazaMn6xJB0wO7qCU4fsOsPfDqnhRvgCAYeO4i90lN4wL0eA5fkcwPPG+KHZYYbfZiaMQnko87AXl59/MFqeskAHzKXHEkQ== 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=dtfU9oRlwVeRl2CVxxLaJpoZFFiVMA5cno4HBQLLR7U=; b=ral6sIKWvL99dOxxv7IfM8FPeX6KrbJ3K4Giu4aI4AcbKJ/ojdRcjV7G4PIfmWDfiBhAXdIEzCkxAgbdjH1gR5+AaMQsBX4fTbrWpIyoTUoPUwedxhQKK8Hjr7NqeRFuN0/nm/wIq8/arVrjwCxX4EQpdm8Y7IUTJW3GXoqZlKwO1tBfelDRaOrCZ+DuduXa+rAr4vjdt3aEWB1sc2lkUrhr5Oi2Xzanqw2WbY6vDEBWbaJcYhebSpZIn4wzZ2yvxGkSKzgNs/h2tZX0KGGlV5UmA7gm5Ur9UImyprxFtg0yn/ZGbX2KBZaPmFv9v0h9i9wfRwVtFgdvkYLVh+5SvQ== 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 AS2PR03MB9718.eurprd03.prod.outlook.com (2603:10a6:20b:60e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Thu, 13 Oct 2022 18:27:58 +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.5709.015; Thu, 13 Oct 2022 18:27:58 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Tom Rini , Rasmus Villemoes , Sean Anderson Subject: [PATCH 2/3] cmd: source: Clean up a few lines Date: Thu, 13 Oct 2022 14:27:30 -0400 Message-Id: <20221013182731.407192-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221013182731.407192-1-sean.anderson@seco.com> References: <20221013182731.407192-1-sean.anderson@seco.com> X-ClientProxiedBy: BLAPR03CA0084.namprd03.prod.outlook.com (2603:10b6:208:329::29) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|AS2PR03MB9718:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d28a665-3a7a-4227-2420-08daad48a721 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9IzQF5m0malWlT8mNYgFZHkRBMTuloTX+4pSuLBRSSWDbn2harZ+iKFhOt7z+wXi3bJGNXLz+MiJuNqngcaCu9kmk4avhuyWulkVVj+JV6Bp2vxvGfCEumE1R71kt0VrKsMxfQ8Ea4jOQtzPNAqOV+f3ehuI17lIkNN42L7ijGgZX+GKMTE7lNwRJQFuecwdj2dBbz6DqVcnwKaXdPfzlSr3EFm+VKe+BQ6IU0cORYPe9cLRploUMjjVXm1PQF8F+N8jyWOD7x72iameZ23VhL5E3GfyzXG3wfd94t38477w72Px14m6CJ05/JvdvITt7Ps9PSBaotYY258SA6SRojCrfBsvcQ47+UU7VjSj4k+BbGXdWkEmagnqtdC8Bgxo+s8TLuAuEetEnw1Bnat/PxTS3ryWbhcAPjvY9NcExZyagkfnL89//W3Y9ylVKaKrO1IJgb5VGnOzqeROkIZ+8yFOPIA+Qgzx5HIqZtq5MDbx2tS3it73sbP5gcOTm42wHeMVg1Zryu0OKGtmo1kmP+QfaeHc62qJoXjZpW7eN9w8LmW5oV8koF2Kh0BoMlJJZs4spKOj9c38x77lgNsO+kcpxIVTm3y9H3St5Pb/4wEHxRwnsSr98+0YUMLXUQlkRwohxrq+Uq8hAVRgYP9f613q1KKBUzYeZM95J4HuEZxSD0bjMbmphgrlRMbGbJHlcuEVK7ggJxYF08zC2Lp8BoDaKrzi+582nc2/Yy8/gDOXZCwm9AecE14Jb8DtgSX5GMsxfU6qZ0aW98SRYATLQQ== 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)(136003)(396003)(346002)(39850400004)(366004)(376002)(451199015)(8936002)(8676002)(41300700001)(52116002)(5660300002)(66946007)(4744005)(66476007)(38350700002)(86362001)(4326008)(38100700002)(6512007)(2906002)(36756003)(26005)(66556008)(6486002)(6666004)(54906003)(1076003)(2616005)(44832011)(107886003)(186003)(478600001)(316002)(6506007)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JqaWazC17AM7Vaev2oaziZMfB9htYF+wZhs5NITe55RxQXkvmpQMtnZQ2vx4bFjLXjz3lVutEpMWMczVLgWq49X9zhxqccd7MYq2iT+cV8zkRSzNFt1g5be+EId2GIckD+vKhrRFw/IFIJkykOIynWN50pevRGpkBmhZORBUwjeS09qkHaLnBWDfvhpUKOAYGQToMa/OKtDrO3CML3LSfKhms/ThEUpr2waMEdMj7SkUAJ5tVAqN4fLbKnZsGXIupzl2BjxW58W3iUkpqqsUWUTeVIKkTFTrU8zmGWSKnl4VZsvA5izd7YAEpxWYEjyg0stS5Cg2Hw5o+PEOZrLKXlPvW0om8MoyFa9EUuiGOY6q+UxKjX+b9vafHCHAi6OrUGkLNWaXWy2RcIU/lWuSazeIcbl0FqQ5Owz0kkkRzivlkJMLo6858cYlkX5yqXHAFCNpJc04XaAKYHJZYwqVHaCvcntXT+rGUvkn9ak8wmjB6WsrFF7zCpgjgKd6alFwKBtIq2mb7vkPKLlHuBtg/C9AaR1XHZXZ4nv1LQpkam0E3xUyRJbFaR4j7BpsKJix2UkXe6pj3YGDNZFpm59e622LXPuDKEA9N8H3Jm36jBgIfbFYSkMpiuDgfAr2+a7sUwiNaB/UC8wCV/f4FzB0jFIaUh7GHzp+Y7BUSROLY8hhFjn9RgdpG6KIu3TQy2tWEHzS2fAlvgGppm9j8NzJ2+Z3iQS3WRy9DXGeiBKjDiCUo2M3PepOovM8/TX2/zu/MrFAbcnnSWYtWAfYjYrc36yQ5ChXEHmdlcSofLdAPqo/PJJsVvZxreoGVorwPt8aV7agaGJ6KRAqlQPalJxFMYMH9tRIk8x6T/F6TQ3tRuRP4HlT0K6CjY8JRBikcUFCf8VH/AEAFLPPt7xgll6JoRTrGTzKlePNnt5nN2hRbLk1mpM9qlS3udijjQiR8TALW5aNbGyTYlQgQPsJ/Gv8alE3wlpipqKSspEVHwAt0YyF1cRfOP1O7Tbyxjt7uHfVeD/KyDn8c2xUFT9YbNgsEYnp0G786j/r+VmNFslqfjRH7M18skzuc1q9L9OcldTWsZCwLivXMUB4z1uYP1DL9QUDR+SAxJW1vcnHpuT0QaQIKBQfwcM5XcayOd0nLNKzgFWVz3tUkuOZcCHYUzJ2D7lqwnX2Ofu6dzEyqjnm/o+y7uPHYxbHE6hKUiC9oHXZzdVqZmI0+xWsbBWUWg6VXMHG0FEWNCohvssWtz7aVIeWC8ux/YTNtVRy4jrgXlcTSDM1TYD7r890jD9X3rbPknefcAs1iXaOilg4C4aua2AbZv501eRTu9qkhPbfqftQ/Gc5ldeLBRWExIdCUO1DOZlIeF28mbkwMWcjWetp9BlzWzQHip1m9kMs26RXJBv8LZJ7+frYW6qLHc5W6mnXqgLnmp0XiPOuSLsx4q0WSuYqPq+MBBWbs3JMOgeT8DQ0WUuVucWRC0K/oDAJYXG4nVppsSdMZr5s7Of7IquwuhPcrzC5EATDvnGSm+vxrvbFhZ0IslsdS+1eVPpcexhxs5uaaadP/5tK33MY0o6pf8O2nzsmoe6xk6K15z1AoV0TcFeYolXSsh5wcvfOooVBmQ== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d28a665-3a7a-4227-2420-08daad48a721 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2022 18:27:58.1907 (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: ERxLMTzmWzYx/Db+uxOQA6mFB7QB7INg5inuVnwiWpkSMImdHEnzGPswjL6KfK6Oy2C4UGUEDBZ1+b0FjWWFFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB9718 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 --- 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 */