From patchwork Thu Nov 3 21:35:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1699210 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=fszF9IJY; 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 4N3HB52xhxz23lQ for ; Fri, 4 Nov 2022 08:35:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 58024850C0; Thu, 3 Nov 2022 22:35:53 +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="fszF9IJY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFE69850BB; Thu, 3 Nov 2022 22:35:51 +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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2078.outbound.protection.outlook.com [40.107.22.78]) (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 C5345850D6 for ; Thu, 3 Nov 2022 22:35:48 +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=VPgzeKKHbjKe10IgPDKxBY8KjCXpeQO75OqWhEhuyifARN0QUphgoThjGN1SKuRmnauWIbm0iTKojIlvwRTlfNfxuzeaExMv5k/YxSEIFdxyNmi8kL4WKhZsm8xDyABuqE8yOC7zDjsFQ6GrYnR/Pu//STuiPtj7FZ9DovED3lNho5UMpgywb/x150GkYErchzcZQNIcXbLqH4viJOe72oOufqgJJwgCG6HvitPt9hTgBuGm7l6uFKFFv0Bsnl260ArJdMJGdDC6H8QHAg/5uw1p83IZu4052JJ/b4AD45USZqS5TSLu3jeSKb/iqL5vPKbQFobQcPBd9iNbi9B+7Q== 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=rfSGxdCNTojsvl9CkOjP4Qd6oWyGgjBdedpyqImAfC4=; b=cBBhcGf+7XUMEgoCw4np5mtctu1oYc2SuSp0LeqFFq8iqbidG8HiEyAyImQboNqGOqXBU/WV1+PtYEefa8jeCHivuhjiOFPt2bWUw0SIxqLHi5W8/sG9AeCkPbQ8s52t866EC5wmVA1MO76ZjXQKhE7hxDo6oXrL1f39Fs+fsGz5TpOzEMAPOqWWet/CK5jLWTJJJSWd9QAAjzT4BSvN/qcB9zqgHtqycSfr82yfL9VlRlbV6c2mYl3jM26F9lMxxhuEPKtwxR5tkDi8RS8+cu2CxHO5GxlwUtDQs2jREtJooCER8NNgjrZByCw8xa6Vn58spkHIJt+q7s3I34GCYg== 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=rfSGxdCNTojsvl9CkOjP4Qd6oWyGgjBdedpyqImAfC4=; b=fszF9IJYuGehi0g6RHvjbJEGQDu/4hpAixgrv8bnJPVvtgK/MzCuMAJhQ+Ap6X/0dUcgjdw3JtYRCT4gx44qx9BNa9YRFQTRnf2Kp9gIxm973T5ZU9WUXcnBsgrEdYLI9ijXFN2WSd6Bb1N1pF2YzDEYrnyAcgw+l8BRvZGRuu2GCRNgRCYZP9iwfOwpaZ6YuzDMhtBeh3qD/eoIguSIcr3iAdLJLufDeL2qPvKV1bZgjB17UdfeiAFvuI4bQGenI+6TbWyuHscAzb2jzxev0kW9I/1mVdEAjEQeh/3kWWDjsSXvx+5i4X3CNScYxbrc8OaRoxES8XY48yAFR8mENQ== 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 DU0PR03MB9660.eurprd03.prod.outlook.com (2603:10a6:10:42c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20; Thu, 3 Nov 2022 21:35:47 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::e9d6:22e1:489a:c23d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::e9d6:22e1:489a:c23d%4]) with mapi id 15.20.5791.022; Thu, 3 Nov 2022 21:35:47 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Rasmus Villemoes , Tom Rini , Sean Anderson Subject: [PATCH v3 3/4] cmd: source: Clean up a few lines Date: Thu, 3 Nov 2022 17:35:32 -0400 Message-Id: <20221103213534.2336001-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20221103213534.2336001-1-sean.anderson@seco.com> References: <20221103213534.2336001-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1PR13CA0376.namprd13.prod.outlook.com (2603:10b6:208:2c0::21) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|DU0PR03MB9660:EE_ X-MS-Office365-Filtering-Correlation-Id: 02dd9272-d7b4-4296-eaf6-08dabde35f13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dfIoSKvyGh0DF0PByvV/oeCRS4jvq1wtPjK9vX7do2rMira+X+CwW+w5V3olV9ZRJD2cWD0fEzNgxAem5px1F2BQXIK0HqHL2xJC4jHK4rYL+UJ3hUg2p6rTz4vQMtfDXE/pvKRQFrtpXWSt9+0DyDUCfex6ZMrxnYZQC6EV1zbUuRa9Su+0MCB5nOEicpJMWiE+6mozlcIjmpcmdrgfh9rL0v/7/vfNcL6jCqVj58of+38xlpgy+E6jnTkcDJBpKYwCWSFaiioxb7NKDDlJtjDJT6XfWPbngCSmyW6D0dhzDCA+aT9e1Vc2ynBgx/cN2rw/VZvDyOZob41IrufSX8+evLmVa9eFQUuxXT9A5aAn/Jy8YZim+8j15jAvip5B7tMb6ecUDMhOZ9TOkZVMkZZ+n/rmIg7s31bJnsM/y6RceRceVno51ay4UcdFJexk1x89fKAyaWWlPc0Q9ZNLRVgvTqtFkleivcU5cxwCKCu6SOXAjpne9Q/5rR7I07vXN6aoSaorYMm3xFyiWoNg7wxO5UfWLblHDUxLCg8uc1SfXoGtrKeYkRX4aIo2QvJjeyGXAVvptgSPM0y8XcCIgta2yHdhwwiAGv5vUuwtx/Y8FhT/cD5HAyu1cfbql+oNzrmmd/ac9V4K7HYOzRmaPePmGa2tt8hSCw1vPMLUzE0erDIFym6focz3Ul/AY9xrl+i6+60QjB5ZDBlYb0lzLNevX9649SLw94egBuxysy6zTt/nfFRJrRiRisgA8Ndb 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)(376002)(39850400004)(346002)(396003)(136003)(366004)(451199015)(5660300002)(316002)(52116002)(107886003)(6666004)(54906003)(4326008)(66556008)(66946007)(8676002)(6506007)(66476007)(6486002)(44832011)(1076003)(2616005)(41300700001)(186003)(4744005)(8936002)(36756003)(26005)(478600001)(6512007)(83380400001)(38350700002)(38100700002)(2906002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FhLogTmAXS2+z2FAJeyPvKlhbJwCtAIUOumpvoK7czHFlohuXw38OmG7wzBQvDFMcJYdlCgDWNVaTgwKtmykGYCArfKd4megVK8sZbuSANEJt3OwH8u42ApSawoZ/gmwjMmKDJRcjUTpNvDNv/hsnnTRRhccmdKj1gUeqC1e7AW9Mrgztmh70eb0xL8/f0OOrZPuucKAdFUOJlmZpKzSuVHKBYxIY6Kr5dmwHG6KRPbLdU8bKX7GOuOLC+uw9kWiq2IAEJw27kWFn11TM9XW0XKVUSz5QPzkBi8CFFM74jLbOn8X/srY/f0XqnidaqYnQuUhzhly1cLkQ6fhnHnrdfqWK9KtZBqxZaeG7hL4q47vOkA7bTfh5r5R9UJHfK3aTuUdp3DDXiAWprokmUXtPf068tfJOmNcqvtQUnv+NHISpT/xOujtjLjCDxlv1drSK6iLdEblIybB6xeFrwBK/WKHW5sbLBZua7859n5Miy2qUpjYP4IGxeGX0XbqSGausRmRaX2p5X4DDzApq5ZIqicQexITwK+jU7er97JVMNs5DySXLxlziO8ONaRk4kcOBQ4om4NF74XxB/KcsNf7VUVL0T+0XlXH8+XYWQ4QZXKybvBL1ln7/mrJxniVQRPITH7GR0XK+p2UFk/7HATR6KHrqYir1D1rOC9RlTOeGlcK8zkINLajnPrk6zNp0SwndMDZlMk8L7cPnTiJbEvv4cBbtOMcBSLbCkkv+8N4jTofFVht+8BJijv15Q2VL9bplN21RvUxw9RGcXyqNCAjUqWCUg+VZVJEVoW7eMs1QiBwnlSRyudxEUW8Krf/DoAIy4o1dWuMpy+DOVBjWthOP1WZNcRDKUfLqm0MfqfpqVnJVnFv1sXnTm2UvbL5q9zi5UsonIOQ8B6d9H1ffrWLQOHp4vbtPdUTdD3tsMK99i5jXLe9KWRLBqbQSWtud6gcRMV0KO+6iN134EQHzQNEcvUTYE5SPqFG3swQAxRVtDNpSfME7HkVkDSnuNMs9XTsG8MFk7/YiBMIyGIysT9jgLcXpO8L/1eWASj/JR+dwAfoArPopNeuAbkIWWjlTehP0PFS79qjvSlLyluKtVMygU9lJ+KHeVFVsZLtVBRS8YdNjlBbzy+FG3vBwFp4uUbuEffcG4PA/80ViPwTBG5/uIb0XpI4+Tj9NP2Vpno3ctE2Q1mW6Ee+1agclb/HScX14iSp7p4eoqSpu0YzeLG4+ZjMPh4SftZNp5n58lqMTmB2ng+LJuJS084eZrn+ovJvrAzc1ks1dyNwCJ8TB6esd8W2PGAtxJKNm0gxPSsEg3qplmhzqjBkZi/IUP34s7WVdLcoxChaC64qRR5qCbPjdFTg7Mq4+grks2hsbLL5x6uHxYFxtkGdmNWaj9SYPlDXK2NKE3dgJamgIOc6OByfdv8uipCKFMXoyQKC+WAFQQ8+Mcic8KH8oWQ02ozmRNDEQx0tOs6CLoq7zfV1RDrpHiu1tuKcyTS1Xh/joJZhQkHL9Bp6WUcOx4K+y8hqXwZkxPrtdG7Gu1PPSxweF+zIUZcv56FvFs7P8nEhGLzklyGN3HcUQ4lA+wlJXez+ClHUnc8brWRUAskbic1kUFeitA== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02dd9272-d7b4-4296-eaf6-08dabde35f13 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2022 21:35:47.8900 (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: bouwYOaMBxqQkzcbzgU9FNxRe9lJQYZ1hqI6LT5L3q74ANTfuXLoJYpskaH5e2XnjdGt1n8ZheUFsiHIyZdmyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR03MB9660 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 698d9f86d96..59738246018 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 */