Message ID | 20220422182748.2309992-3-sean.anderson@seco.com |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=TfHGYEiv; 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=<UNKNOWN>) 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 4KlNG327L9z9s0r for <incoming@patchwork.ozlabs.org>; Sat, 23 Apr 2022 04:28:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E302B83D92; Fri, 22 Apr 2022 20:28:32 +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="TfHGYEiv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AE93B83D89; Fri, 22 Apr 2022 20:28:11 +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_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::62e]) (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 9A8F583D91 for <u-boot@lists.denx.de>; Fri, 22 Apr 2022 20:28:03 +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=O22AsEERR5JP0OgcVMMyH/x7eI6jQj5Jgz3d51Bi18Iu2xUUWM7Qw/coQq0KoOqeM5DZ+TSrPHrmzhdnHEe+VbileGuGy9saodmNH36NBcCVj5Z3c6DryJMrCDYhwWKfPVs/qzFBIaCwF+a8alZPGppbYpmgiGTUnJY2/qYj3hBLakm4aNg6cfGLR2vAJ0zsQZRUWF+KM0emyGDcmffBvOdFahx3j8fkaQ7J2Uh3yv0ziXPp7BBeXgN/4icjTr7j67Jd/SDSNSBQ62h3npGjTZ3+WUyswtEKFQd+gbUsRnvEUBTA3tiZ0MO5ZckYsrHtPUWVBR2nivSSc9SnH2BXxg== 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=h9cF4CkkYaWNj1ecG1rYowqej50djIKW1qlRXi/y0fI=; b=bhXTmWKQVHEtSdjK9TukaMnzNzNAPFPG1io9/ietLS1aQBR6w/E8qWQ8zi6ufSm+lB9GoPGUGYNEvCb59WCazXm3gsOUDlLMGubvdNO624iXR1SUQkG64DzgekgjszVzIgUSBQWFMDxJOQct9TxuwXVt/GkFYF7FSKEgcpBOk9/vWCjY8waPwDFCFt7P2px6fAuruP12gZ1yBgYgkdos5uvBtckcVjwxijkrohXCd8C4TdzI6dzN360fu2H9KF+AXqmFdLL15BKS0OLsNhjYMjoE8MAjj5/uHM/kGVP3JYSh8QXUQvpCGyG4aIn6RcMRi7n+aQzr7PIamAsDSPChuA== 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=h9cF4CkkYaWNj1ecG1rYowqej50djIKW1qlRXi/y0fI=; b=TfHGYEivUxYlzbneuyQT/sUiuAmGCdIQyQCstxp9jVNpOLhOsd1y8B1/tP0oXdLt6D6SztMXWMCyaO77mHlFcPTqRKNs1qSVXi7eC8NK3/TcsHIK05PXwx9USkOP7pDJJLrI8NNsEyZ3a0e3pd0SwolYCBnA7+9CrLCTH/ptRnLCi6U+VLIU85rjOoweBZoO28NYmwCtGAgK4AdnfzLkOUtbDDR++EyESbbEsjqvnF/cOlM0ALuvmscGXE9CNNAfDa7/foRV6kYt7ZysXU/kj5v7i9ilfR7mKry8g8svP687bNc+bR2WyKms0azgNA74hchYVNIBEDpHJ5iI6THRxA== 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 DBBPR03MB5462.eurprd03.prod.outlook.com (2603:10a6:10:f6::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 18:28:01 +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 18:28:01 +0000 From: Sean Anderson <sean.anderson@seco.com> To: Simon Glass <sjg@chromium.org> Cc: =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, =?utf-8?q?Marek_Beh=C3=BA?= =?utf-8?q?n?= <marek.behun@nic.cz>, u-boot@lists.denx.de, Stefan Roese <sr@denx.de>, Marek Vasut <marex@denx.de>, Sean Anderson <sean.anderson@seco.com> Subject: [PATCH v2 2/9] spl: Convert ext to use spl_load Date: Fri, 22 Apr 2022 14:27:40 -0400 Message-Id: <20220422182748.2309992-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220422182748.2309992-1-sean.anderson@seco.com> References: <20220422182748.2309992-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BL1P223CA0005.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::10) 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: fdeafa1b-6e66-45c6-1d48-08da248dd528 X-MS-TrafficTypeDiagnostic: DBBPR03MB5462:EE_ X-Microsoft-Antispam-PRVS: <DBBPR03MB5462DC8AC0BF2E02EAB6FCF496F79@DBBPR03MB5462.eurprd03.prod.outlook.com> X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oqxMrMWfLLCz4pwg1WYhAorN4VwsMcS44CX2Itngv6klQoi+LtTgjTxhv8KzuSbn/f9ikvawBjOERsJRIBGE4q6iiSphnQul6gd43ytF22tv3jaIsmAVQPWQpJJvuoGg8KFnsRrwziCYPSrvX9S2HBmrE7adOr9RZHDKiXzkaIev2eNUwGH8CVosMxOQUJ272Uqlq/vqSR4eXIEC7D+3mDsoRuVCmGdIHX9NO7EYzEDHwB16Gn5yIHeuhDsfGn/aBpcehh63tsExaVuhSrD+WVIgu2NpjDLfKnG5LpwBJNIOcVJ2OxdmMM9GZuGZ1snL49EH0XG00Gp3ZpnHUtBkfPn6IIQesatT2WESb8HDtFVcHytYHN5ab2Bdb0dd9TShpCiTUvSjNddMAlyxlGmFBJ4aGVXiUvbovn8t1TzNZoiNz/1PtH+lT1Gzyqi7U3BFtlFVMQRUvLDB3UzD00c9Sc+Ls6NGtWoMHbg5ALwm56lLY/8IHenRcy8kY1W96EwrQbjM94zE3XzRRk6gursm4UyYdPIRQNBXEUZI7syZBFMoFobSmHkAtylZ9VYNEJzIecZUn4n4yr48JEjo6buVNlgD1L0dMD+GZrbBVTYrMfrr5Q1npDOCkXpKgPSEpUz0BkLhFBpb/jiorwJL7mk5zfD9E5kyFN22BQ+YM/N1RJIL53mbB16+E3qzPjmZ3aCTRMWDHgChmfA4O012Wp3xvQ== 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)(508600001)(52116002)(107886003)(2906002)(38350700002)(38100700002)(316002)(36756003)(54906003)(6916009)(66476007)(66556008)(66946007)(44832011)(6666004)(6512007)(6506007)(6486002)(5660300002)(4326008)(86362001)(8936002)(8676002)(83380400001)(186003)(26005)(2616005)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6lprTuNP2uNsbGoQiGgxvzkokuejZCK0l4qvzYS2BgsV+oh0K+XImK8OWnBEj65EeqwJD/rsXYwKcNmKBfYMBm5PozroOfaCFcecUUNfO3VpNTSAlmby6WwCQoDOe2LTjhkxzTN0LVEEPxo+hyaWpKKt5wNo2OIWCjvTn9es4Dr4sAs2x1E/5MBmOB3IjpF0JNGsmtMPzCENj4JoVw239+y6ukN4NmsGd1YU17XMUe3uWjA9YY25xPH7ZI3srK+pLXSMSZctPaB+jJdo1l2Vd6oN/tgqoJ1oFRYhcbH/gDY1Ak1hjPwfo+hU9GWsj7HRh55rTAuHwm9Nw/KZPoj1bXPSnpEGQRFe+094D2sb0n2JjDWDrEnzuGscupKh/FuVfoXqF2/olMWNR9vS038juFGdYrFBkuWcDhTYvPZy9a6OIlcuuwwEgahEkhzF6K7rkZC3rPg3Q7xW89Kc4BA/UCw8CEge6Az0a2kqDHieJYKMB1klQuIXFcluPWQO799RYwfTrI+/tz5NNbmVWHqr+Pf9K4tEp60mt0iRDvH1MVqlFgSMcqbFWuavc7Np6SkdfgzzMc/OZI2IJSfdzzGAVSDc/5zVaXVmdH1BRpDqnn43GtvBAx3GRDZFtj9wpycfT48vRiRxys5sRuunLCV9nXkip3q2PvMOuRWAv6TjYJrPmT7g9AkeLnbZYaColUvcRDaBkzWPb5kbZXHdrsT1LY1y10aQlulPYU0gDEDz+NeWkGkEbzBxHNbS6Z3BytgBDWeJtcZil95W7vwH8HQm06Qzf+sV0wwnU1gUuPxjUeKmjkQYL2u0886PxYTfx3J9em8SruABjLSeUJQ6eg9pUVyfdpAr5tIwV6JlGNGbGCMyNgR+5olA5OstQ8HPfPHxTo2AqZiUVNrAoubGSsZgY/tDDn7WSLBwpnNy1GYe89Ul1IRgpxQGaAdPXmihzF8u03kB3obyaN5mPwFLoA3q0H2SPf4g1wVGHrBk3lxgjbbc+qW9b3SLn33CUEjLuzar66hJwkugjmLPVRp6qgGByPiyfqdNp5L92Cof8fXfsvZd8y27J/iMuS74VbRtvFEiXkRsIbv+pyJAoiiMQ+ye5dV+rkMnWg290998CRvK0JUOuRWtqi/A0Pxvgb3CMb0JRmFC0Wv5Jk87RbcPK+XQ4V8G3odvAwLCnHVkMvDbF/cK3dtbad9x6yXgZkT33LCnWds83cLI17SAgDlkxcdvAVqb8LWleyaPxd33vBacTVjWZX6spAOGiBFj2FYyGtzTfJ0UBKEexXBeK0ZgJSpgW95eX28G8/x7fy4+pEw6djqqFzcgoz3ORYtkeIXP3zfS14cpFabh6TZMLVBoMRmmFpUmAaY/yfbQ0w0Qd88VN3LJkQmXJEPiovyrLDJsXSleGo0K1pPoZjQFclK3+Wj8/bCi9zalQdIq4NGs0vOBQZu559yfWkmAc9Orgk00X1qcye+uMXRJASgpX1XYkeNVEsS0wBqUAkNoc6daFCAVS4vRYsEoqRnudfAqlZZxy3rvVyBtRH2L63uIVQrU3qkfP1ie0xnOh6U/DQbzT9KqZsCYpDfkjL9b953IBtWvEscP+q+lY48OFLfkMDH/bQ3u+3KxnY0xtkk8Og//wtuBeybAbYx0VcvNzE1rdhWJUCBVwlF0WqGjJLiiG9GHbvjrdHj6rz9LHu0cSDapTknHsL2+ipEPCjScg7kQg7CAQqZOBnQEoFCgRvnp9BMokmwD6Vo0XbYmF6n24POqCpv0IW0= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdeafa1b-6e66-45c6-1d48-08da248dd528 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 18:28:01.2761 (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: QMHOONfTbOIIcuqBe66JWNFLwFedFP4wIrAehwqy00vlDuhkNAGZwnoWQeeH+urTMhIxNHBRjZkz+ZycEbjOSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB5462 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean |
Series |
spl: Use common function for loading/parsing images
|
expand
|
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index ebd914c492..1384842776 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -9,6 +9,18 @@ #include <errno.h> #include <image.h> +static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, + ulong size, void *buf) +{ + int ret; + loff_t actlen; + + ret = ext4fs_read(buf, file_offset, size, &actlen); + if (ret) + return ret; + return actlen; +} + int spl_load_image_ext(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, struct blk_desc *block_dev, int partition, @@ -18,6 +30,10 @@ int spl_load_image_ext(struct spl_image_info *spl_image, struct image_header *header; loff_t filelen, actlen; struct disk_partition part_info = {}; + struct spl_load_info load = { + .read = spl_fit_read, + .bl_len = 1, + }; header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); @@ -47,13 +63,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, goto end; } - err = spl_parse_image_header(spl_image, bootdev, header); - if (err < 0) { - puts("spl: ext: failed to parse image header\n"); - goto end; - } - - err = ext4fs_read((char *)spl_image->load_addr, 0, filelen, &actlen); + err = spl_load(spl_image, bootdev, &load, header, filelen, 0); end: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT