From patchwork Mon Dec 12 19:12:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1715129 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=L5G/D58G; 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 4NWBBm6BTNz23np for ; Tue, 13 Dec 2022 06:14:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2B1585472; Mon, 12 Dec 2022 20:13:37 +0100 (CET) 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="L5G/D58G"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE4EA853B8; Mon, 12 Dec 2022 20:13:25 +0100 (CET) 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2085.outbound.protection.outlook.com [40.107.241.85]) (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 5E8DB8544A for ; Mon, 12 Dec 2022 20:13:23 +0100 (CET) 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=U3+/EG7BZwUaa179jvGSMuMoNF4odTVDuMM28pZg7dHv0M7NDN6vVHnVD8xckCspqudj9bIGM+Toh6tGebB+fYi84YEdRgqf93tQQuAPbhAQfnsXhV9g1iRUwITR6M0WeLtOxZyxR2bGuegZzY1yYtreTf5V9JYl4WihUIPT6uyMhVowBYlWSa9FIfe/8igxzbkqJsG8HUTPxpIUm4BlWHsGmDjrs28eg/5j8s7o9xiNW5IVG0LoGFKqgYHlrookKoY8OKhBdM/39xjOiPVIZuj6/UhLw1BWtG6Xbw4hsfi0YCxeEN/AHds63H/pmvbJwJGkn6KYxsI/YfEmi3Uq4A== 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=xs0fmTjy92SfFk+W6CJv9NyRtbUWzpiFLW9j8ebDWfk=; b=gq04SLikYWDQLihViRAY6Um7H28RNT0FGmCXXQ7FnFO5NjM3+qm5ah8qfbqLmhBYdg/fc1b62ajgHav5kRbq8Qh+v/2hoL9wv8blhxBu9AHqxPH6MPNB779ldQgNZjM2OANXffnjOtMDEjCmlR4itPdAotW1C3OBPAil48Kf5we+K2UZKn69Fp3X/26YOUgcykTNgYV9ZsvFxhaq4YZFv7B0MYHWsAkML3zDN4SnP4xxhWnE11g88zcfHMf637faaxWtWsBjZYak1P1NF9ZSI4fjaV1TgGs22e93rs/xPjqpCCmpAvZk5kfQ9boxH0wF5Ub7BRU+5rJQYmQMm3823w== 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=xs0fmTjy92SfFk+W6CJv9NyRtbUWzpiFLW9j8ebDWfk=; b=L5G/D58GKvzPh89ApitbU6RWjObYUfe7OYsWLMoJ3I9gWgFw3+9lNsjiyfVBk5YP9igpHQSFB7DAkxA9gQE4u3uTHzXj/tXOyq40UnHGb/BdwLWxb4n/a3yk365Nfa+7IwQ1qt9jqHbMc/GNwE9393wKz0lkH0LDoH+qjJp/t1mPEFbGeUVa/kJzFqyKu0NitIeG+EuIXIPwek7+NkMlZAV7i8PAwdvOOg0bivxzqiTjM8uUEJwTZVwzIeJSzxgYLoPalmwaHG2y7Wm/esEC4MA9q/15F8U7DgTxSkgXdsbQu1LghdSb6XZDNYsmmDvDdGwN4w4hUwBg2of8SekQTA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by AM9PR03MB7980.eurprd03.prod.outlook.com (2603:10a6:20b:43d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Mon, 12 Dec 2022 19:13:22 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::2b95:1fe4:5d8f:22fb%7]) with mapi id 15.20.5880.019; Mon, 12 Dec 2022 19:13:22 +0000 From: Sean Anderson To: u-boot@lists.denx.de, Tom Rini Cc: Rasmus Villemoes , Simon Glass , Sean Anderson Subject: [PATCH v4 4/5] cmd: source: Clean up a few lines Date: Mon, 12 Dec 2022 14:12:10 -0500 Message-Id: <20221212191211.2105335-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221212191211.2105335-1-sean.anderson@seco.com> References: <20221212191211.2105335-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0046.namprd20.prod.outlook.com (2603:10b6:208:235::15) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|AM9PR03MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: b7618b5c-feee-4c60-01c3-08dadc74ef77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fo2KPmwX8fPoLMpovjHLDOK8J5X6143pRvdbI+j9Z9iGpyt29S8eAJXDJdhJB5AZZvtFPGglOEe1Qm31NYUVBDpcGWeHOJxQu03Da0s+SQEUc+IH3W0LuPoFVpZYF0b+udOCxkT3we8LFsaps0C9nPPRc6Xll+PGlcJmvtokhSMcnbr+DGxHTTtQwzY4RHoz6QMQPPSXtd5fH/VNKa6lmtjDXyqr6+uRwT8nbWjUkK3/w8bH0LDCPE+DoIdLPDNmfeWO1zFeKKXZe+5hzhUEb7oi4j1Y3nMBdFTJ50lghEDfuxDj84p1DwsL/bdELWUJbbxnvGdtoW4wojn+UaRf0+cXsDmiCWMNlHR+Kqtc5hG6N0HAT8NfCclItiQ9VAaTANGUaDZXBAgH10oLkZfmPeeK+bddAhZaYb6Smab16sN/o5VLUL+jpCmgzNBpXEFah2tQjruGeasyF3rTmyvrIcWyP8k5V2XAU0AEK1X5TqF3gPw9VgB5PJxlk6sAd27z6Cf6izUgg6WsRAYSWtaScJUDzvvH+aEWzeiosE/MZofGhD2vwR0DOhUSad2fgI5oDbEbbZxyOQxxMh4/hBgQu+nw8MbXHx9O+ObILSQ5eCAf4nsuLyFWohKtNJ1no/0DddipphtFcCkLn0B5fc8TwIM+3gmUP/F755EC8AUO6T1fEI0KjkXj5KvlMDbSnglN0xinl+aDPXzlJm9zz+gjag== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(346002)(136003)(366004)(396003)(376002)(39850400004)(451199015)(66556008)(36756003)(41300700001)(52116002)(66476007)(8676002)(66946007)(4326008)(6916009)(5660300002)(54906003)(316002)(8936002)(86362001)(83380400001)(38350700002)(38100700002)(107886003)(6666004)(6486002)(478600001)(186003)(1076003)(6506007)(26005)(2616005)(6512007)(44832011)(2906002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TxTLc0u4m+ePqg8ouYMODEdFCJ0KRQqtnBsNTpGxXLbNbLxQ70hBZQ73jVr6unyGqiyaF18WplKkFkp3yrFc0zim1FgoWv1HtBwWvWKkOsDU8wbJw0wSsBZOyremximudqZEJAh7G/FKDHat4lFhyABIy9jN/SC/RoIYoXlhflU5DFszVdrMgHy0dC3x6gbcoS+ttjlRQgG0Zw1vEvMvPYWscWVNBXIYXHQLU9HwgdOk0Egp5Wg/CytZ7depM2nDuCwJIwmiTcmtLxNufs/ABMKDdvrihdbUi9+OVMQ9s7mfF2iNvWKcW7UX4FQLQcYv6SiJMRX948Kq9bm8XSJR6Tskfqdfmzrrpr8xsoChv5ijmRM8lqTtvv8t4ldfuEqHeTqSfYizNCKwr9vTnNx2kx4suP+A++BzeRercMBBiak5ch9Q8pGXFArUZku1nvAEJbh7rCJpMqoBPrpWqjWMIPaBysqyA9o/rGXw9ntQL7XNsaE8lHeqXoDuiFgwh3Dx35u+TqBOf4Jo1zrew/7nMYDgrIAn5emuvKNhcJTbU2Bs65LXhDYtz6a0f8OA/26NEKHwEUCJ8menA5XLfxm3RU3/SEMOTjbokn7LB2I1QfiBLPRb606Mlh88iihGusldV7UzvIBDyic9rNaQPKS5lX2D/UZEatq9e0vvqxH1kZjgIEsE8HnpMDdBCdDR9bsG0nxQyScMzO9ozz/8HPDgm7UXLZvT0epmBxKvUthUHyKZAqEEL4YNhXOKsNV4pxwaFbqQ2N9PVZaLnYRopw4zu/nV4GnMLreUKBgraMSWLL9oX88oXXixZIpiQMma6agSsQhn2aNy9rBWidi9YthBN6qlcGSOlb7GjSLpIxVYb3989rWiApqi81VpP+u1JXNv+odH7FpJtyICtbJ5+srz+lenefsuRFHfcDC0ScfDuVIscSVBUUIjtdap3K4KymZ9WPy75JGPXeQ8UBMet6ooXtFeuHSNzsMzMNym/XFeXqeJaFacpVFzcVlDB/A0sitKOOMaUAM/gEqeAbAG9PGnl3f4tKDSSgJpv/f3jn7XuhK+lM5JNZLXlXjH9ZpDtcmf5tgVYFune17m/qOhcjqwNHjSklS/MC7tnQm6ZSV84QYdoWhY/DW8dJD36Y818I0J7LZC5ftqFE1WIEZAlak2wga3mg1BYC2A69Kt1XU5wby+Orye30/XlauX/p+mX3aWfNa1CRQ+/1CAInaNqVlFKnjKWcGL86xWCowOR65yQeeIWW3l5WwZ63yvOd0pbaCte578B8ukfGnmgGG+6411QlZC3xaDfcZCFix4dtVR0/V2xy8xUkGnALhvnj3c/8579TuqntFf1q0RfMch8MjnrZ5+TfAx6lJSJQGExDv/GDGFsCT9HWkh7mHd+Bud5SjOYZ40+v6sI6Wjh47diujRcfwK3yty5Z2NFqBqaUYvnxw8rsnKagN1qxeLT0fpCJ2zP5UHQCgUBvF9pP81J65C0xWtKAXURhZrU2BRCaUKi7r4SAG6OPrfwNLvedwHUvxFqSZpjefRVZBpO5bAkEV+9OYmUXplXqynVmirqYRB6fhB7p8MNA7guMOLhoa9mzhE/UmoPlqaJ6qZuMWK0faqBw== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7618b5c-feee-4c60-01c3-08dadc74ef77 X-MS-Exchange-CrossTenant-AuthSource: DB9PR03MB8847.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 19:13:22.0248 (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: KDL/e6UaAz2gV23AkwMWryUWRf1uWWJK8LQ/SJYb2UfDRA8C1s60smMiMtkgLWkyz7TrpJ4g03juVkSlqv69ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB7980 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 698d9f86d9..5973824601 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 */