From patchwork Fri Apr 22 17:38:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1621050 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=iS6JUUAz; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KlM9Y0n38z9s0w for ; Sat, 23 Apr 2022 03:39:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 145F183E28; Fri, 22 Apr 2022 19:39:26 +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="iS6JUUAz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6621A83DB8; Fri, 22 Apr 2022 19:39:05 +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,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20618.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::618]) (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 3A66081D4B for ; Fri, 22 Apr 2022 19:38:58 +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=BbIs8yakDRs8LE1bFmenq7+GH5O7q67OHGO8EmNQ9LlYLa5nJ6Ek7Z44c7UFXMTr85tPSSz0eBHEEowwQ1JnXqD1GBHGupPR9yYMOHg9v9wkwhRwK6ZpQn387mSL+5f/THxm8VjV83zjRh4uu9WIsPO5G28vf2x1rgfP8x3fLuDpz6HkI8X533EjAKBv+fyD2TTQBAKUvoyaRgLUCdFX2VIM8asDfaHcXg0WAJU+z3DIXSXWQLM8wbWJDiFoU4SOCQ6hosWCXrXbhsH9xNUjtC6CWHKyJpsZb9aeSfxmo13PQRKJ8KpvN0Dar/WchS/n++z7FC7Ca78HOmXWxgFQjA== 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=Zepg91xovhfpbzysvBGvdvMSTag03+iniCEiGS7FPn0=; b=NulYq+9cfLqKAiDqPOU3/G1Fzfat0vYlA/Gx/dimdDLolY51SKc6WUGOTqOwNU/aUF2IdVNZjbQO0Pqe+hwMVpjrYXBwzN/YGsFSNa5Zge8mvXyXXiuljJPHMJDqNlDPaKvCfLERGoIJRuXQrohO7M87wtU4gDEeUWub3FPLOa3KYlyNE5vCei1UpnAdq3SHQgZjJ11y5EjcK+267Zf2/4/4iY5iZ0Q9FJg9Ozd9EcSvKru3NcRTvcgsY2WwlE/gS49A1OOxZCeDO6KHtfB7/XpBBgH3/bC5I/9RWURX3CVQ/hW6eFeSxDPzoRh6nf8Z6eGOCrtG9O0OHqA+bj25Dg== 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=Zepg91xovhfpbzysvBGvdvMSTag03+iniCEiGS7FPn0=; b=iS6JUUAziUlEjwSJBMImTU6M4M9fYbUq3BF92eo+ohIFH9XiTwwQ82+G/lenKPj1i69JKhfQwaNujT/I6U7SI8KDjdcidThctm6BTeOsFkTOig9xz/YehiYtQue3cTnEHXvTgJh0vcEhCrS81kOXVV5TTHqTZ2mXdG6Q8+t6V3uVh+mnmDV+E+aqOojWuupWVSvbMaAF/d3d86IVKTCzsXPz4J7AsVjC2rHtOJ7FC0StCTR6L/efGw++hP2zG3hkrQuhzoKxxtEsMqx+OmYopM6rtS9q9vvZSfexMQ126dImuV0GSsF+hnWfMiasfVW+tV2fbqrItTxjqJVyNz4wKw== 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 PAXPR03MB7806.eurprd03.prod.outlook.com (2603:10a6:102:201::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 17:38:57 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::714d:2b6:a995:51bd%4]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022 17:38:57 +0000 From: Sean Anderson To: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de Cc: Simon Glass , Priyanka Jain , York Sun , Sean Anderson , Michal Simek Subject: [PATCH v2 4/6] cmd: fpga: Convert to use fit_get_data_node Date: Fri, 22 Apr 2022 13:38:38 -0400 Message-Id: <20220422173840.2260582-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220422173840.2260582-1-sean.anderson@seco.com> References: <20220422173840.2260582-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR18CA0009.namprd18.prod.outlook.com (2603:10b6:208:23c::14) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a16d225f-01f7-41a1-ebd2-08da2486fa5a X-MS-TrafficTypeDiagnostic: PAXPR03MB7806:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uMdE+36QftYD/vd3wl4lgmbhd8sN5+3I8TBOK9ZHj+3AI1UUSwFRghnv9/HHLoDWrT17KLZWRfDEg1kIJDoP8+fsKKZ1Gin607F51BGu8/1MOIILjsBpEdFtMuJzXhOdMPMTM6ffFHmfsSirVCeXiHw1qnW3Gm8T9bcbbfbPn6igeM529aeBd+VATHf7TOHMhs7lRTeEFCsfLcnlUlQlN3BLkbF6U9X2LJnoeRt4DzTTptxL8IHS226ScsyLItRJl7Xs3oj5CD6xair3rp1NGoA47RxeC+vGC3Oa3DuOa1t9Gv9VEkx9JeBKYtzEDWcjRnRrV8AsYOauEJAb13Yxd3MX03F2lpmPa2GKy1xgY2Ecqp/hPi1tCAygizUpWdzNO5fhHxG57JP4iXLQLEeWEbhtyvGbesudEZ3GVprwQ9iOQHiKHGNNImGfchfMi90osriQwPNanFiPT4gKE2F40L9SpmbPaI60VZ/nIP+ajnEVMqsPhpBDGzhDuARbNcEVTkkNRK7kvTtD2+bunZx/DbOz61WDmo/gj0I8e4Kl2HX28LS1WAzENrUW0frMEku3gG89jAmbXi/74+UYll2vvEq8mBpWZlp5CQCtw3rFc3VG715JCPj+gNaPvhnMYSpKoKyh81hb+AFvI9LsZ38DiVPd4E0vxaf7oo8YI8POSzMcUue2XSFF83cfZETfRmqOODNw1qllTp7B6f32QvOOZw== 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:(13230001)(366004)(83380400001)(6486002)(5660300002)(38350700002)(52116002)(2906002)(86362001)(6666004)(26005)(6512007)(8936002)(6506007)(508600001)(186003)(1076003)(66946007)(66476007)(8676002)(66556008)(4326008)(2616005)(38100700002)(110136005)(44832011)(54906003)(316002)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IbjlPP6tAzAheO0v9hpJk3Uoy0v2pLmOu4QDf7mnNyIsG7JLwhgosYqbD+46A2eqbKRtsZXaGPLvkwFUkjeVcWNB/moF4KMIeuGe6xjfvPbNP9esz9KcxqT6syVHbNVzXCtto3yTMFwh3d4Kerqa+I6Nm3c4xV31nL6iNdlqRhSu+AWWV6LcaSCkBHkVNrN5muK0qkJu4Nx451MH5Gli5dvWO5pDxl5RWtfdHLAAAAmr60JwjyCRdR1EkUE8bBXe6qLt+xeggFix3oHq3QVuQyRQtyO0E8oA8xJE9EObVJEMnYAOkA4sJu2l4H0rTWaTz42izP9j7IGj7spv2VVyNO+VvNIv3a6WIbCkzefrPLDIqAgu5yJFgl58LaPwfP+EXPTabYSVlyvlxJVO0+2LDlcrwqyDoowRGa5JHYm4VpzB5rFcSqw+AgIroCXPJFNktFG9XpSqw5RgVDQlgtpmiD0K1vqu/1KWN6BFhPl7YEbZIDB3hRC3Gp5yub6plvzbcS4nwUSg4ljTB3A9Rx4nFlcME42rgyEXpdgNYNYrKB7NbLCTpXaZQeA5ibuk8cCSB6a0EbXV2gIXWPBsICdFbgtZ73095waSbJnPII7c+Kws/DmogF9SCV45sEOPuJe3tF+cmfeAHp0Wfyrh7VDnG62vCIWJFTuUdY82cyPHTWj96kOkyYZSWaLP/47HkmD8c8bwSeUzdwn9+bl0I+7Do8sp3vYUa/ldX+ZaGGltn6P3lEA5WWJWC1KMpvIwEIrN24FEqxyrewsokzZIu1WbdWUCtTxF14Jzg0VTp/nvGqQ4kV9BeT7DieMM/kMWb3SHBUyqkZ6kYRN+Y7aKegW10/dXQh773P3o/pXeHxNpq/fbJ4hTTHt9OVTukOCZ20xumN/f2/ZvhrS5r3MwIYgWXIvU92ZnGMit9CIT0kWGrz5u69kXsRCirrBItmOUyIDzW+CBCVhmxxw08rIZKl98WmXFRvQYixc+NjMvJnaKM7GdqrS/X9F+axeK9hLlpaFGLhj67x+n9TiUvJ8IMhxy4GsSMEm+BJKa/sneJLNhrBuy4N4+fpotwAJC1JGVWSFkX4fRfdJNSz+D4inVRFCi7VeDl8WleRe6ZddzJ8QqltDfCEoyBR9zoWqriTypqcxlSr3/YFVjkSovP2puuDGnZSSJDR++C807s4N58ZSh4f6cno0BGrVUs8IxG9rhD9C30fS2vv7cp4CTcb1Kr+lt0A5l718TE/P0rGTXS8qinW28tnVVqcPVUEzn/+GJfOGTizsMj3KnelSz08YTgKI9FszlpmRNw3Ro2yPIYdS8N5vHAIsAD/k6owFhxZhlegLpI7Cqw6eKRCfrTLGw6rtugBlkMcILhIVpZgCiAuOU9uLYK1m0PgcvbVwgtEaP/UBdUy0y4W0B5ROLzcl466/3OGZDEaFfrNXJwoM3kdSiodxKfarqVCLL4I+woQ0+TslyWcU0ZquDvu+FPfUjdQ1VR2HKav3xlspkFLHldrY3bVp99eXQcu2ER/7WmHVoIPlekJUHuTNnyIOwLqrvgx9ItAInBuKboPxgXo6IOQpI8EgSrHsVA1jHPVE+/JNe+6br5Ts/iCJovUx965UanTYlt2v9bAEV8Qi/kX/UFjkuZgopo2bsMt0Utz0xZUVqgdAT4ZMp8imAOcBlURKbO7S2okjFjJ3rcs8AH1MylaYNEKWks+S3Hl/BpR0zaize124EyQZdcL6mOesHcrijaeGZ6OsOFs1V7/s4Bv4NlgOFbMs= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: a16d225f-01f7-41a1-ebd2-08da2486fa5a X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 17:38:57.2076 (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: ZMyAG1PfUhUk/YeG4NpoygAZ3HfBWnqrQTAX3aUNfpuC7DIR7RS4QAMc4ER9fsDuWu/Yeb6UCYH6vD8dEfflvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR03MB7806 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.5 at phobos.denx.de X-Virus-Status: Clean This converts the FIT loading process of the fpga command to use fit_get_data_node. Signed-off-by: Sean Anderson --- Changes in v2: - New cmd/fpga.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/cmd/fpga.c b/cmd/fpga.c index 3fdd0b35e8..1102a84d76 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -322,7 +322,7 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, case IMAGE_FORMAT_FIT: { const void *fit_hdr = (const void *)fpga_data; - int noffset; + int err; const void *fit_data; if (!fit_uname) { @@ -335,23 +335,11 @@ static int do_fpga_loadmk(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_FAILURE; } - /* get fpga component image node offset */ - noffset = fit_image_get_node(fit_hdr, fit_uname); - if (noffset < 0) { - printf("Can't find '%s' FIT subimage\n", fit_uname); - return CMD_RET_FAILURE; - } - - /* verify integrity */ - if (!fit_image_verify(fit_hdr, noffset)) { - puts("Bad Data Hash\n"); - return CMD_RET_FAILURE; - } - - /* get fpga subimage/external data address and length */ - if (fit_image_get_data_and_size(fit_hdr, noffset, - &fit_data, &data_size)) { - puts("Fpga subimage data not found\n"); + err = fit_get_data_node(fit_hdr, fit_uname, &fit_data, + &data_size); + if (err) { + printf("Could not load '%s' subimage (err %d)\n", + fit_uname, err); return CMD_RET_FAILURE; }