From patchwork Tue Aug 16 15:16:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1666903 X-Patchwork-Delegate: van.freenix@gmail.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=ygeycywH; 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 4M6ZX40swFz1ygF for ; Wed, 17 Aug 2022 01:17:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D282084953; Tue, 16 Aug 2022 17:16:51 +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="ygeycywH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2FFC484930; Tue, 16 Aug 2022 17:16:39 +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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2059.outbound.protection.outlook.com [40.107.22.59]) (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 3AB9983F37 for ; Tue, 16 Aug 2022 17:16:35 +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=MzinnA69aRIHjt+hzaAz9VnAAxcZJGGv/ueuNdSXVWV16YMpyuG5BxG3Xc5uD9MOFRXogHwQjoZdev9HYPmMBwVr6+3nAK7O7/yudmMpxRoIrKroze5rJ3C5uWfqWst3EJM+aaE6j9g6/RvH0R8BgvXDGqHWHiNSqWNmJHDIeoX9wQQuofyGctvD0dLdDLcncc3HjCLgHRnds0l42S/GO9Ykxr5RWTW4wgA4vPpwWQkFwkIlA/D29RuO8Rm0527SYI1CaS+pWXrNrIoTt3+WXRf8D/na3gOh1hBfWXVbUpspNkMH4++ssbfVnaLoOHD0kMkQHtx9SqZu95r4ZC8ukg== 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=j2Fs5ohrixeaBn0HLqbxSf81u1vMnNO33zmbYhP7Q0E=; b=KzsIa7bno2lWWKso+Om+93whlo6JCEJsmzMXQfwJiCjWbO93Zt7P9b7H9j3dbKZDVwrG7fv5Lf0opzIxdjomWGDOWMyBweUegEYf69O7gKKi/W3q5h5Ar51zxTdHeJWfM0nn0oTP4j3dW6jNr8i+FtLTxOR7rNn8nrrAlrK/dyY6Klu8lstHMaZoNsnDYiRHNzarLs3d6LkHUnIxfr1PMAJzvY5BgbBUobdUT5tzUCWaHbkEs54FzcqR+3JiQR5q7naHTIVeihmoCE1hbIamCtlj9kexFw5xzRy2oKnVqMNjHH6/1KBu9QJAXWSoKR7IrflT7miPA+BqWveh04axKg== 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=j2Fs5ohrixeaBn0HLqbxSf81u1vMnNO33zmbYhP7Q0E=; b=ygeycywHbsFfSBUiy4fpmT5bzqH73e2XEVLnbFdVOpGfGBQqkiW65cZYqTylu33P7hS5XwcOxpxBRLIlO15oUkJPQWE23vO+3KmLp3t4Vu++O/G69Db3cKPlwJ8dxBmuBViTVZuGCecZxD1BTvKKO7hMksQ69UzuASUATbymWamV5fVsYHI0YA1M4cYgbYLhoQiq+CnZ87XlAn+jC10ZiJNy1B4/I2ltFN09EIEl7R1pcLZQh45h8qfuGevf+8KOadpdc1ru/XswB4Hf2/wXlPxnLsyU5+o2POHgP2cT6VZoTLmVQaq1Qq61mPyv1pSp+NsEZDHf10+rYF8EXbXKmw== 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 VI1PR0302MB2735.eurprd03.prod.outlook.com (2603:10a6:800:e3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Tue, 16 Aug 2022 15:16:34 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::ecaa:a5a9:f0d5:27a2%4]) with mapi id 15.20.5504.019; Tue, 16 Aug 2022 15:16:34 +0000 From: Sean Anderson To: Peng Fan , u-boot@lists.denx.de Cc: York Sun , Ramon Fried , Joe Hershberger , Simon Glass , Priyanka Jain , Sean Anderson , Michal Simek Subject: [RESEND PATCH v2 4/6] cmd: fpga: Convert to use fit_get_data_node Date: Tue, 16 Aug 2022 11:16:05 -0400 Message-Id: <20220816151607.1569660-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220816151607.1569660-1-sean.anderson@seco.com> References: <20220816151607.1569660-1-sean.anderson@seco.com> X-ClientProxiedBy: BL1P221CA0010.NAMP221.PROD.OUTLOOK.COM (2603:10b6:208:2c5::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: 8722273a-0bd5-4582-adcd-08da7f9a4e14 X-MS-TrafficTypeDiagnostic: VI1PR0302MB2735:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kdvQZiGYTcXSJYBWl6yZIIxvt71x5wVv/jqAahRm+xdc89uoQHC6iKF9rZHnmW7x26/vR1hvkRilaLT7Q6GnsXnhrIaknmcaLsumpGUEN6+qbmdTCLrNMGy95uSR5arFNt9X9/TZ4YtCNkKOBMlp6Tb5AQ21gVYcfLG8wg/FftVppl7tiOBwHZN3vbHVfjx+FPhd+K35NFF04r6bvug97aTSLfij44pYCBzs+3PgUX0XNFs2PgOHi7/ldN1l0HoVtw8jQ87YwgAZIUCW+JpAxKezvLrc59JGiply1n0mCZBfLcVJyYULwbNPcnFpCKUSHT4yQX39GSoLBwaO2tUu12jkLnvOI8l2UB5VYSctDV4SWRbeBd0GtJOIEUHt01r7+/LTBXXlw5rpoUUY/4BkBQDTxOuTRncdV5s1Km820PgDlyd9/2TDjiS3UHsrVYOrXiWx5hAHh6xKydPSkcMYOXiKMeH/2N/FQBXT+2OdSfjFsEKVJqoUNYMP2XALVVimP2RXuL0C8vB2QKzZ0gCJnXQq5qZKURIi+TnnyO3pDg7BRFTv9G+3vlPH56AZfyzQ4Y7gOUhKDymRN5A0T4/UCrsBYuxowd+tDvH9QIIaA2GBo1gaSTvTnaZQzMYAwmhPDwj6yNsOq/potjGFed73qIKYspr2EuKuWRw+ggFoMTTZYdOWc3riLrA1VSSfEF9RuBFC7zRXFaFMlWzLMRmzcdObSdgruEm1hdTP67W80fCv1uee2xcImlWyFEzC0hiCYuJSDamAME81nGNhULgywBh13YU1LQdEKy1RhzxYu38= 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:(13230016)(396003)(346002)(366004)(376002)(136003)(39840400004)(6666004)(478600001)(54906003)(66476007)(6512007)(6506007)(52116002)(26005)(86362001)(41300700001)(316002)(66946007)(66556008)(8676002)(4326008)(36756003)(8936002)(2906002)(2616005)(44832011)(5660300002)(1076003)(38350700002)(6486002)(83380400001)(186003)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3Q5xlyjnKuVYdvm8OQ0ybwn/PJTaAlHzOXMKVpi/FkoBCinC0vh/kFN7u6fG87Cr6eHg8319PBPXvdlYo6jfnT+fJpupYCqh2+ExUAjOJPfy6D7WJli9/AQ8xAZd7l7fLZWeSzmAet3Kf2/YFilVeErWSKApTnfwxV0vhfV9+ygIoUoLFx8JC/fCbYb+swaar4JTE1wyPkTwXAKXDJOdvnao2/xFBDXluePOXXvx9+VNZJj80pRkDcG86JlgO0TfgdU8eIWyHWUb0jSMFULkUQO0zcSnZ1Xd9VjHU9rNMQayDBuvbGGq5uvzcqeQ2oIAa2GXrZOwgrQuvzKRwMinKRfjkpoOJD31jYhW59rH8PIHAoJAFjWpYJH6+oz37quNK7lJ4Fk8k2C4H3nxmajrDvkla6enrCTRwprc2o6kBeKjpMNxO+HJC1sFmVPFjkiyZhgus+NEXICvKCH2jjnoSssqcT+6vFEiHsbEgNKqtmVDcs9VbJiJ+EVqBTKunopzRoQOx3B+iAGRjp+VrxxfpFxGgVb0pIHQlNf+rKX7rtkYxJN17UfZHxUesNFLMXUV74qT/EKOFSvotCWsU8hyTyE3RXN4a25BeNA1dcQ03EN53K3jm7UG+LIq42ru+AzicqeEdaZTbWnu7s/SabKNXDw/fm7wM1Sv4Bp++YkuT73Ni4u50YcsRPypfhXvacyD8VGUYg6O4vn3lF85b7Z2P3WiL47nd00DLAPqgjMccnMXLHgVywLyBNIT9sUlKz4W+bMCu6+YlWLzEa/2n5dXlkH1nCHkeVyzTe0ZIgeRxNwG5MSWgQnQfubhcjtO1ZZVwfbEZGf/R22bio6lWjovfGhwIm3axRkbR7SFfdAQ2hCdBomGYcs12IAXfRGnQ4kavnik99fAY3GcXnSQuyTOW8QU61R1ObmohJjTzMbOoUJjgt+zEI0xEFzUADySqGpKygEhqKdQPA2/1ppgq6N9fL7gmCBJTy9lJ2UehZJjHv1MxprtEiGRZUjA4pm/IWfpKjH6D0al6zLNOIbDmFjPl19/smVVC9pgXraJksfMPeS7QE8SVxeAdEQbLELub6BomRK8X2+IZ+dHtcSSJx8JfEdxBpVujCx4hmwqY8sD3vTWcAv13Vp67EuC/HhFuu/WnnGbDEBJEWgkkUs2pN1X/cTSeSQ5SyWSx7NbpPqDLIX8Wz1mlxaQDJ3r3UgMrA4dleck7J90YBgmGWmweMITfbC38mfcPHEMFSMq3GdUGyFbQvCvqso8d4dhaeD3JwsHOGphyTn8hGOnaBMXQRZN7EWQ2kfIu3vayhi1yQyQHzd7/VhEwU/cifJI2BBrWY8pHrvXvwLv+5fMTGEzKQxQSPFqVpNg4loVZcmaYlgNQiK9nOJ+EZgkw6SNMUHSdSZgdoAfLZL8AQgMpMto27cvgb+hIRTvHTlb7yamEdwA7Hqz0WpMqWh6UAEaA+jN2o6Avx/pAbX4gGAw0OZKyWDdg6fh04eXEKC7ZEreSmc7vdFgZZW9ovcTzomlYPO25nTR52090VF7wPUtJDuhRLu0CKJuJzC80OsJPGdLV/xiuvz6UuO85WSjNDUIQQhFZcSY2lbakMAG+Ep40bmYeihSZQ== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8722273a-0bd5-4582-adcd-08da7f9a4e14 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 15:16:33.9421 (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: aovPIZv3R21qxN1+CFIZlQ+81BONhHeyyDtUciQXCCd/t6+d/liZFLqlyDdmkThksY1uSkFHOUWqTJnnjJLKWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0302MB2735 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 converts the FIT loading process of the fpga command to use fit_get_data_node. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- 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 c4651dd403e..9cf7651d8c5 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; }