Message ID | 20230724171256.914133-3-sean.anderson@seco.com |
---|---|
State | Superseded, archived |
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@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=<UNKNOWN>) 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=OTbO4yps; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=OTbO4yps; 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 4R8mwD5LDfz1yZw for <incoming@patchwork.ozlabs.org>; Tue, 25 Jul 2023 03:13:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59CAF8474B; Mon, 24 Jul 2023 19:13:41 +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="OTbO4yps"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="OTbO4yps"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6943286807; Mon, 24 Jul 2023 19:13:33 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20624.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::624]) (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 2B0498676A for <u-boot@lists.denx.de>; Mon, 24 Jul 2023 19:13:31 +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 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=OrQdtmMCXe9lidZiVQyqpBKM95vN7pxmMZcOqHDk75E=; b=OTbO4ypsi9VPzgmSht1UYCxz49t2BKBz+Bgn8zmsR5ZjzE1B7IpQGVO2OeYroeQPUfWIW5SECgHIZU26W+he+toKS/K0TRujcRu3QWTfwNKCASpOSmXXne4N3EwR2paRpVv8JuJ0iu9/DmHlk93kwL1iVmSKNtjgK6HrPR7jriPXPpulUZXtZboBzoHnERulDIVrj0U2vXgyUZZe3kFcYwgJT1w6Y7IiiC8VST9v+ol+K7+5LxSFpqR9xSr/eOv1QhAUEOO+VOdMxB0fUOsBGsOZWygZbKYe2nVNojUSgyaroxsJ1YcbuRLdHhDcmZ1scsqSWgww1fPJIne/EgH/hA== Received: from DU7PR01CA0029.eurprd01.prod.exchangelabs.com (2603:10a6:10:50e::7) by AS2PR03MB9420.eurprd03.prod.outlook.com (2603:10a6:20b:59c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Mon, 24 Jul 2023 17:13:29 +0000 Received: from DB8EUR05FT036.eop-eur05.prod.protection.outlook.com (2603:10a6:10:50e:cafe::43) by DU7PR01CA0029.outlook.office365.com (2603:10a6:10:50e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.31 via Frontend Transport; Mon, 24 Jul 2023 17:13:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.82) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.82 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.82; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.82) by DB8EUR05FT036.mail.protection.outlook.com (10.233.239.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.25 via Frontend Transport; Mon, 24 Jul 2023 17:13:29 +0000 Received: from outmta (unknown [192.168.82.136]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 5B26320082C8F; Mon, 24 Jul 2023 17:13:29 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (unknown [104.47.13.50]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id F29E62008006E; Mon, 24 Jul 2023 17:13:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ehZvwy70BcOY5e/6C39USL4CrjW5SQVCjt7KxcOvNMcnS8epphnRqRMg508T0T0WFtZQIz02ekaCRjsiymTeQjX0motLhKcIx54kun/rR/FFw7ZX+PqJLpcJSUI/Vy3uFd+318227x9vgwuMjRKvG/jP3EYfcvrCJ+2V2VKTMFQWDoHuSuejieMDZ0x4NOSz3uBhNwoJJxt2U7r/Dyl4fWjI9gdjFu6EwxHnZo9FW6mqhscZxijuPv5jpHnhFXHUV7lEtPM6cC3usd6zkdsraFHyz7je9RadvSH64hFwa08UmWbMSl42KspRgsWAbLS2gRPcKfEmP5mY4kSJNfFVaQ== 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=OrQdtmMCXe9lidZiVQyqpBKM95vN7pxmMZcOqHDk75E=; b=clLI35ntG9QOnP+LFS620BqSF+3WRbwn2K/DhIzdrXmTZVR5KE1kbPKZAQtkGkci4EE2guBo4fg6LhvffPOYfz6FLBGh+wdC5MKGHAUgIu6LZraXyfREdhGueAm998b8N1gs4+YxMELsKOcXf2ixmpWTEOqj/wyIiqmbc37qbJSZeLX+XXzsBkFF3FcvhFXdoIJ4dyPgMK2mxIj7HiNKWfHoDSKlR89D324RPVUiUG8pWvonLwXz9N++86i/Hu9Sal2ISo2gAkoxyWSVP+xn+OA3AAxZVMhTB7QxxeaVSINqEN+NX+FjczHnhvzXQyiOXg6o18fFSEAfM6eIEiOCPQ== 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=OrQdtmMCXe9lidZiVQyqpBKM95vN7pxmMZcOqHDk75E=; b=OTbO4ypsi9VPzgmSht1UYCxz49t2BKBz+Bgn8zmsR5ZjzE1B7IpQGVO2OeYroeQPUfWIW5SECgHIZU26W+he+toKS/K0TRujcRu3QWTfwNKCASpOSmXXne4N3EwR2paRpVv8JuJ0iu9/DmHlk93kwL1iVmSKNtjgK6HrPR7jriPXPpulUZXtZboBzoHnERulDIVrj0U2vXgyUZZe3kFcYwgJT1w6Y7IiiC8VST9v+ol+K7+5LxSFpqR9xSr/eOv1QhAUEOO+VOdMxB0fUOsBGsOZWygZbKYe2nVNojUSgyaroxsJ1YcbuRLdHhDcmZ1scsqSWgww1fPJIne/EgH/hA== Authentication-Results-Original: 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 AS8PR03MB6743.eurprd03.prod.outlook.com (2603:10a6:20b:29e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.33; Mon, 24 Jul 2023 17:13:23 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6609.032; Mon, 24 Jul 2023 17:13:23 +0000 From: Sean Anderson <sean.anderson@seco.com> To: Tom Rini <trini@konsulko.com>, u-boot@lists.denx.de Cc: Xavier Drudis Ferran <xdrudis@tinet.cat>, Simon Glass <sjg@chromium.org>, Stefan Roese <sr@denx.de>, =?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>, Marek Vasut <marex@denx.de>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Sean Anderson <sean.anderson@seco.com> Subject: [PATCH v4 2/9] spl: Convert ext to use spl_load Date: Mon, 24 Jul 2023 13:12:49 -0400 Message-Id: <20230724171256.914133-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20230724171256.914133-1-sean.anderson@seco.com> References: <20230724171256.914133-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR15CA0037.namprd15.prod.outlook.com (2603:10b6:208:237::6) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|AS8PR03MB6743:EE_|DB8EUR05FT036:EE_|AS2PR03MB9420:EE_ X-MS-Office365-Filtering-Correlation-Id: 0707f802-3358-4466-04ba-08db8c694d25 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: a2Ll/MLwZDOTfUDbb41ngoIdZVio4i22quf3oFXmoFBVSA7XT3fcvT/XbZpnsa/BgWMPM1xhb3YhrjPazSzNuwaCaKZT5hh4zfKdc25mlb6N0nqBI8f1N49G64ZzEVDRjPpVBxPBH2o/7YP3L9Fde/vnINNxgMMcusivY67hIFutuFlrUO/5E2Wlc90Ks8DhGsnXCTI1meVWGm+lqSjkZGWcc2lF6Wx+BG7wn4spaDcIix7kfFvQC3pn0r9UViej3Ym+mFhOCM74Kc4uBAT2k0D62gkrW4pAKiexCVrc7IxxO/fOorA06VKhy9QooIg3xU6QPOYDH7kYPiZFXSOZ/snnO834vaX8LtTggQI9yNBSpvDN5BGBarwD5ZZJORcPVaKSGxU03Kq6vwYiccMk5DfWGB9kg8DErX6n1L5eD7br6GQw9cbBrjpdryBnvRfjD1yGEYsTFXxawABl/fDQXgbAdlvdGnAdJuKRVWfzKKw66eqvoBfukrfdRkKfaQAi6XqV0ViooHeXKx7D7u5dD8EcI5m9PpKCkhOvJwOKMl0vIzlzCYc4IzRBqFZBsYnuzYZRk7qhNJj2kWctBi5U45miPgFzHETwmF+xPlj1/ygJthaPqKNLEP9PZqApQmEd X-Forefront-Antispam-Report-Untrusted: 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:(13230028)(376002)(396003)(136003)(366004)(346002)(39850400004)(451199021)(86362001)(36756003)(2906002)(52116002)(54906003)(478600001)(38350700002)(38100700002)(26005)(186003)(1076003)(2616005)(6506007)(107886003)(41300700001)(44832011)(5660300002)(6666004)(6512007)(6486002)(8676002)(8936002)(66476007)(66556008)(66946007)(316002)(83380400001)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6743 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT036.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 65edf325-47c3-4019-3927-08db8c694973 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GYDNZRqlqVblcCf6uQe8jf+bAC9xGlV5NqqQBs3QURHieETdQRvBZZOBb4UCMImEOD5JMa380EAf8c1Wz/Q8qWcEUeZgu0xBCzTshts3bUJ971ubY6QLPujHQgWRWVMYeRIp1AuhO9QWoWOEx/bh+qHZsWQININnPwjiipzi7pEz4KB8icuWOCjGRtUaB2+2GYaZGRNSQIyFOgT1YQJz9OCHbKQepTLKRTnhx3enrGWwpedsxBp0czlcJmn8lyKWHeKvb+z6pAcpLS9DHh3OgPqjaSBtZ6gw171CrNo6Af8v+RKMs3usOGBt8AaQnD93JusdAfiVBlIiuAOi8ZBnXRz9ED9tJzt/zL+T5pX+CbNjEpszcy9MU58l8+Z8uIREs73bHx7DNRK9xZpfp7Deq7hlc+5d36QSiRHw0pQgkkEoKdb8V3oZCi5DF3YMhSxUbwOm13gV6RyWN5XK0CerJdzIthf/IhKaBDVnzbw0Vm5kDSZ6rLeaIlFR/WW0/sFFXwt8XeNlSHszrvyH4PRzQ+cmPjSiSpO19ma05/oJqea47qdhemF7KnDTsW1kLJTXdUpWJ6m/fVadOfGitM8VXoKbeqk/IGvqArsrD4ZhFp2fgJfA5rgJY0/kqn0V0EOnfaIBGyhShiT2heTMltHnSFUiL/M6vwWuriSKSaEq1KOGEaCmlW0wx5ivrxa3zYga+bx8grNIfTklW1OWLDOlwyun1L0r9NPd8pgK0kUYOoIW2NTI/f4q8cVV5XmuHWWSAp+Eutyncrz3OSv72aEZAA== X-Forefront-Antispam-Report: CIP:20.160.56.82; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(346002)(136003)(39850400004)(376002)(396003)(451199021)(82310400008)(40470700004)(36840700001)(46966006)(6506007)(40460700003)(1076003)(26005)(186003)(336012)(36860700001)(36756003)(5660300002)(8936002)(8676002)(44832011)(7596003)(356005)(7636003)(2906002)(107886003)(82740400003)(40480700001)(86362001)(34070700002)(6666004)(6486002)(6512007)(70586007)(70206006)(83380400001)(54906003)(478600001)(41300700001)(2616005)(4326008)(316002)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 17:13:29.6002 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0707f802-3358-4466-04ba-08db8c694d25 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.82]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT036.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR03MB9420 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.8 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 2bf34344391..2c3079c3aff 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 legacy_img_hdr *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