Message ID | 20230724171256.914133-6-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=bsBuNK+4; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=bsBuNK+4; 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) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R8mws63qnz1yZw for <incoming@patchwork.ozlabs.org>; Tue, 25 Jul 2023 03:14:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A53A0866F4; Mon, 24 Jul 2023 19:13:49 +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="bsBuNK+4"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="bsBuNK+4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 619CE8474B; Mon, 24 Jul 2023 19:13:40 +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=unavailable autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::60d]) (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 EB530867EF for <u-boot@lists.denx.de>; Mon, 24 Jul 2023 19:13: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=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=mMnveMsxnJBQkJDAm2PT8snj+Uc4fr+Hj07SPcZXpxI=; b=bsBuNK+4pCaaXjtYzcPmUdFT9UUonfY3HrVAuRZaRR1wvI+JL3Sb5qXBGSAEyQleFdWQoTAfZhqAPp8BAQdRvCzWj0RrVRdVvbjG1nQTBm7Uv90OhJc00K4cCWIoVqICyNww6Ng8p2dMbWU/kHUCXpLL5l/oNZx9m8CnqI1EEfUXE8XNA44XHfrgLo6LU1oZsltfgP6q+oJhccH8RsfITZAsFw59yQot7ef/gAUwti23r9qVJgyyR1Jd9EHqtvjgS5MYHtWf28mFzamsKS/lG26SLPWzHIB3y+GoKNibxLekELpjrcdxP0a6U8Qi+OA5oSWci2NGAcO/hV6ujirW0g== Received: from DB7PR05CA0035.eurprd05.prod.outlook.com (2603:10a6:10:36::48) by PAVPR03MB9137.eurprd03.prod.outlook.com (2603:10a6:102:328::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.31; Mon, 24 Jul 2023 17:13:31 +0000 Received: from DB8EUR05FT027.eop-eur05.prod.protection.outlook.com (2603:10a6:10:36:cafe::ff) by DB7PR05CA0035.outlook.office365.com (2603:10a6:10:36::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32 via Frontend Transport; Mon, 24 Jul 2023 17:13:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.86) 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.86 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.86; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.86) by DB8EUR05FT027.mail.protection.outlook.com (10.233.239.192) 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:30 +0000 Received: from outmta (unknown [192.168.82.134]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 57CCE200BB20B; Mon, 24 Jul 2023 17:13:30 +0000 (UTC) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (unknown [104.47.11.108]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 61C8A2008006E; Mon, 24 Jul 2023 17:13:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jmdOHsnDNVS1zRCgiw5kjxBGgUpGzmZu3iWE7SwYy5YbOlTrnX56XRLTAEyjFVzVHWRr1StZgUt+XJT2lpmp7kjdzPdY+MdX4JgNs3e5VtQJwNZHaMlE0fKUHaCBZBnoUSLycTtAG3DTP1jd25ypVXY5QH7+lKd+DVU6OqBk27gCeXAq+GccydqRBiBe86x7LBlBBT5VtmwhB3OJwDtdsAsOpFmjmyuxDCpXEcfqMwqGSuTZcMJPtTCdefUAG+IujgfV5d3XHOe+02Oa2GsmEMpF2WJCbOhh+Blct2+Z8vRVWzp2rxyARXDWGtox6TJ7rEfuhtqn14+wxatflUME4Q== 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=mMnveMsxnJBQkJDAm2PT8snj+Uc4fr+Hj07SPcZXpxI=; b=JCB0Uxo/46gmqfIoyyWdQdXSrHSyRVitcz6lyHs+/t41i10eqRj4pxnNFOOm+2oO4bx1y6bGxitODKDp2fPKe0y37apAmt8gcROv9bd2ATh0imspbbzOhTzlYvwttu8bJ/wkccmOpzno9R+O3CXv5SAG79pFXfSQtfYwagquqRrQNCQiIToY+uAnalQA5IbkZR6kRyk1xKpE+v2W5K4GK+akWPpnEg0aplpOpL/nEnlp4PPH4E0wln9v/YbsP5MCyztszb8RC72w1RrwEdOcAsNNFkqwKsTLHgtR1Uje+z507q/grxNF4eNntJqX0VcVkZw0BP9rUU25kzz/faMbCg== 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=mMnveMsxnJBQkJDAm2PT8snj+Uc4fr+Hj07SPcZXpxI=; b=bsBuNK+4pCaaXjtYzcPmUdFT9UUonfY3HrVAuRZaRR1wvI+JL3Sb5qXBGSAEyQleFdWQoTAfZhqAPp8BAQdRvCzWj0RrVRdVvbjG1nQTBm7Uv90OhJc00K4cCWIoVqICyNww6Ng8p2dMbWU/kHUCXpLL5l/oNZx9m8CnqI1EEfUXE8XNA44XHfrgLo6LU1oZsltfgP6q+oJhccH8RsfITZAsFw59yQot7ef/gAUwti23r9qVJgyyR1Jd9EHqtvjgS5MYHtWf28mFzamsKS/lG26SLPWzHIB3y+GoKNibxLekELpjrcdxP0a6U8Qi+OA5oSWci2NGAcO/hV6ujirW0g== 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:27 +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:27 +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 5/9] spl: Convert net to spl_load Date: Mon, 24 Jul 2023 13:12:52 -0400 Message-Id: <20230724171256.914133-6-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_|DB8EUR05FT027:EE_|PAVPR03MB9137:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d62c2b6-ffcb-475d-1349-08db8c694dba 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: ZTuMCh8YTPBx+iNSYUaWg3sQ3MGxaMyu48zoghaa14stfiTlTZyP9s2tX/5acFMA/NCtLkjYtWvWxmHT6MvaNjmxYriQzEWJL9WeIWuiXmv40HE9sxQ5Fn12iwcgPlyggVYIG6odM9jB74bj3XlNORJxOsnUHadkTPOM7knNG+A7T5nwdkoFmxHyJltWa/ZH+L2lz2JFGjy1MucyciyxXivKf/mnWTqHoIbccORL5pZ3cu28ls65aRj+eDUSm9dq0AsGSQWpN1cBdOyKgb97zAYe+c+Wc3eQmdTJocmHxfO9EYeWMtuV86sfuXsxIB/AgazzqbVvhSsJDIwdBEaIWs+xA68fOAunEJGDTQ/ngL8PVQMIenVJPYVDs3iMquqdUg6RE1Wgm2VesrHRCheB4xdVeombgBZ7tOOc8pEe2SRdBh1uBl5MmiaWA30CUKXE0MAUh8a5bBVarn+6qNWiyIGmnDtIMqMoyB3qLXveo6sv8gV6auUnlFgh+n5m5M3Im0yFfgWzvAg3deGdhvidkxxKctE2ZkFZH0BFXL7OjjPlum0/amsqmH6TNkMOmP6U7DnOXOlcyxrKgmihOFWFFe1I8KgIYtqor30IXNpKNDMoMY3CvJhG2keW+IF62Dmm 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: DB8EUR05FT027.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 31c232eb-e159-4c1f-9df7-08db8c694bbd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3kXrz6DUglT1c/UvjIY/KP2tRMGT+YAkicSLeTGueLr3up+fWg2x2pwQUuxKTDiEAzeGNlelaJBG4t1CZXpR6cthK+grCYbjVRR52TZguuRJ1YrTN7vAT96KJDGvVI4iky+CTP6Ld4oQIpdoU6KWjWzccmTl0cLbEJe+PHIYPfZIowttfIRgLlTBOL3d6OIFSBcImnTbgGcHYzPvnwwLsqi+Gy84WQkLvQAV+VP5qXg/n0TwRh0bIGxt7JAnZF7FY/KKj8DCAD/Kb9W8nptN6krxkRaRcLR+4k++0z7Xf5CQpNG9Vj1uk9OqIQxfhOM/FhvY90FJH2hkVeuIAOPWfOe5S8sfm8XImCoXXFgEBqvQRBLfSnXk5ry0rXMMMmMeY+KG5VamngdRvkYy3pL40zKVqXv92fttW3VgsEYAOWddNCalz6yoOU7TimxA/7Fm4ynYXdwD6fdN5K24sSsrmCRlRSNb50nZKCZehOTZPtXRH6kapFfEyuB30gmE1W9k06ZgrlbTaR31YCTlsxLxNmLZeKJA6Gn04B/XNWdFPIjAJEoGYM6kZDZ0+8W6VUyImNsvUdPvZ5Y8m6iDy0/0ukvYMw2O4wyS2KyiBsAhF7aWoj+ZuTa1e73uel6JOZccTbPVc0Bjxj0KDsvWSgIEvC9he9bcSJI8iDQVaXMPe5/Da8e5tu3wT/ychEivcFyswvdNUvg8qo6puM7Tl+8IYfEjcZr4s02Q+TbcWyh2RAL4zK1aRT0PCyLk/PLeGL60bBhYjONmB8QVJzUz5j6Lzw== X-Forefront-Antispam-Report: CIP:20.160.56.86; 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)(396003)(376002)(136003)(39850400004)(346002)(451199021)(82310400008)(46966006)(36840700001)(40470700004)(5660300002)(8676002)(44832011)(8936002)(41300700001)(316002)(478600001)(2906002)(54906003)(6486002)(6512007)(6666004)(1076003)(336012)(186003)(6506007)(26005)(107886003)(47076005)(2616005)(4326008)(70586007)(70206006)(83380400001)(36860700001)(34070700002)(356005)(7596003)(7636003)(36756003)(40480700001)(40460700003)(86362001)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 17:13:30.5927 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d62c2b6-ffcb-475d-1349-08db8c694dba 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.86]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT027.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR03MB9137 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_net.c b/common/spl/spl_net.c index b2c901b554b..561cad8a1ff 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -29,6 +29,10 @@ static int spl_net_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { struct legacy_img_hdr *header = (struct legacy_img_hdr *)image_load_addr; + struct spl_load_info load = { + .bl_len = 1, + .read = spl_net_load_read, + }; int rv; env_init(); @@ -47,25 +51,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image, return rv; } - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.bl_len = 1; - load.read = spl_net_load_read; - rv = spl_load_simple_fit(spl_image, &load, 0, header); - } else { - debug("Legacy image\n"); - - rv = spl_parse_image_header(spl_image, bootdev, header); - if (rv) - return rv; - - memcpy((void *)spl_image->load_addr, header, spl_image->size); - } - - return rv; + return spl_load(spl_image, bootdev, &load, header, 0, 0); } #endif