From patchwork Mon Jul 31 22:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1815297 X-Patchwork-Delegate: trini@ti.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=idF7bJdU; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=idF7bJdU; 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 4RFCx83886z1yfC for ; Tue, 1 Aug 2023 08:45:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A96C86AF6; Tue, 1 Aug 2023 00:43:43 +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="idF7bJdU"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="idF7bJdU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5505B86AC0; Tue, 1 Aug 2023 00:43:41 +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 EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on20614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe12::614]) (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 B3E6C86AEA for ; Tue, 1 Aug 2023 00:43: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 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=eV0wqpzsovl4MgpIX8ql5Uj4jXc8TcTjEg5/jyrf0nA=; b=idF7bJdUei/ULu4qvcO7/NBcaRo5u1FQIfu3FPPTzUAz9eRYPNBYD/ib/alfVgs3skCzNs7ot2pPMpUDPB/6erJDT5tKMngoB6s0dRzOCRYODCHgjK4snKYXw+uXM+e++U6i37/ZxrtWgQ5BBiLCvxEd75DVeyC6kWmphO2GunddxZ0QnH3QNZ6GADdzav1RLSzW1BnfvYxbMyDDKsK+ydPns7OPV0NTfllpWoImrd/kK/ltIUV5M+2WtR7TaSvEbiMdCcMYPwmmB3CsZrLEak7Uegcv7zPQ74az7iBeCuJEhMsPA/MPJ1H9oKrlyFZv6GdrpbrDBJK8GopjL2o/rQ== Received: from AS8PR04CA0016.eurprd04.prod.outlook.com (2603:10a6:20b:310::21) by DB4PR03MB8515.eurprd03.prod.outlook.com (2603:10a6:10:378::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Mon, 31 Jul 2023 22:43:33 +0000 Received: from AM6EUR05FT033.eop-eur05.prod.protection.outlook.com (2603:10a6:20b:310:cafe::4e) by AS8PR04CA0016.outlook.office365.com (2603:10a6:20b:310::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44 via Frontend Transport; Mon, 31 Jul 2023 22:43:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.83) 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.83 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.83; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.83) by AM6EUR05FT033.mail.protection.outlook.com (10.233.241.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44 via Frontend Transport; Mon, 31 Jul 2023 22:43:32 +0000 Received: from outmta (unknown [192.168.82.135]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 9BDA02008008D; Mon, 31 Jul 2023 22:43:32 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [104.47.17.175]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 7850A2008006E; Mon, 31 Jul 2023 22:43:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BahCvrQiAc43fCXU7IQGMExLmtUzDKnaVRECNLfXC8SOQrXeOBhPhQEfSeyw2KhwQbkrKrWvtvjQyLwSh0KCjBbqiLZh6cKlNi6LBfMBVHxS8n9iFS2iOZFwuBuicHTPaCuY1qdsRvrafbbqavoNHKzHcZpJu633DvzSkd6g0WAybBXUcsx0Jk/VrxTeqpVwwZI2nHidn6ht1nmsD6slH6qCZqn/so5Ce7R2Ll87E4VHWIO7+HbLZZRT4x6xJM1YCgetqd/83TkRfKCo0VBUmgBuHWUbJ4oPA8ZURm70QR4Fif1p55/uA5FNwjlUp1fgk0ge67ulLH9/0nCAP3NCFA== 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=eV0wqpzsovl4MgpIX8ql5Uj4jXc8TcTjEg5/jyrf0nA=; b=TlfO+wIiVaf5s/AliVbW/n/LDchMIrpveGMWfbpiBjyqaCGxcEv5h748Cw34UblT7I6HqHwIHzuB7jRewMehyN21bDK2sL/qRrc+UUk5BFaFCKWuElrFkALTtSm/zyHXKLeRg75IwM4KZvA/FGPpmf1cxSCTrY7bbUNOmVl3o52Tm3n/RkvCgWnYltHuLGZEFo0dsD/7TH/mz3dSVL9uXef9sElSGn0OCcaz1HlrGvAHU1nNo1oxgRBljVZemYdofLjetUHCZtL0pJnY2NoedV8eFiiq43mBHXul43r3L0bmLsAaL1KBwzYwPJsLMTns4Z0Zi+k5fq1Tz9I5v08N5w== 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=eV0wqpzsovl4MgpIX8ql5Uj4jXc8TcTjEg5/jyrf0nA=; b=idF7bJdUei/ULu4qvcO7/NBcaRo5u1FQIfu3FPPTzUAz9eRYPNBYD/ib/alfVgs3skCzNs7ot2pPMpUDPB/6erJDT5tKMngoB6s0dRzOCRYODCHgjK4snKYXw+uXM+e++U6i37/ZxrtWgQ5BBiLCvxEd75DVeyC6kWmphO2GunddxZ0QnH3QNZ6GADdzav1RLSzW1BnfvYxbMyDDKsK+ydPns7OPV0NTfllpWoImrd/kK/ltIUV5M+2WtR7TaSvEbiMdCcMYPwmmB3CsZrLEak7Uegcv7zPQ74az7iBeCuJEhMsPA/MPJ1H9oKrlyFZv6GdrpbrDBJK8GopjL2o/rQ== 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 PAVPR03MB9163.eurprd03.prod.outlook.com (2603:10a6:102:32f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Mon, 31 Jul 2023 22:43:22 +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.6631.043; Mon, 31 Jul 2023 22:43:22 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: =?utf-8?q?Pali_Roh=C3=A1r?= , Stefan Roese , =?utf-8?q?Marek_Beh=C3=BAn?= , Simon Glass , Xavier Drudis Ferran , Heinrich Schuchardt , Marek Vasut , Sean Anderson Subject: [PATCH v5 06/11] spl: Convert net to spl_load Date: Mon, 31 Jul 2023 18:42:58 -0400 Message-Id: <20230731224304.111081-7-sean.anderson@seco.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230731224304.111081-1-sean.anderson@seco.com> References: <20230731224304.111081-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR15CA0013.namprd15.prod.outlook.com (2603:10b6:208:1b4::26) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PAVPR03MB9163:EE_|AM6EUR05FT033:EE_|DB4PR03MB8515:EE_ X-MS-Office365-Filtering-Correlation-Id: 894626aa-687c-4ca2-d2a9-08db921791aa 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: rBhVUp9T7Cy5j+6WOn3PL0mvoB3jvU4RLDaT0q6IBkgcFiJxtf3aOcp6XX1qW4VaVgD8QNruTIgDfOYH0VmqYXqXM+Z86buE0/mFeGNqYay7bScVCv0RURYYDeOBbrPrUyvjA7Ky/g8KxzEqYyGGaQ3WEn8Zoak8WjvjBSuT8QF1lEdPnFWa5n57ayeiLAVQ8dQS6v9UwNMk35GokoO7qsG/k9Ib84W8NI2NO3uE1GGgMmL0sWwnyJHibxQ2nwH8hCJwrh4ohdmTmzYyBe0riJ17O5nfzIhOia//TZvuKuGYMwk/ISSmzqmf0rrZPMHMm27zlEMAVeHLkSfXGyIz+BmxUWKnm+AMZDgQkcShofl1F09fPOccxo52ItDNugHV+IiGe5JUw7gVr6QpN3Z8VBxxTXHKA3PYsb+8lhXLUM3tu8vkaWPVqHislqKBxc2M9YQnafTmzxyXoXpaGq7fqGvZk74Uk3ga2mebarMJWCnqgjqurwFZktdrK0+tkdDT785j7Xu/ijaJi/7DTBw82VVP7jqJeGsrpKdhBOQA/pKOEW4AubaRFi7o4tm1n9Q2IdTpUHMvYKZyXIsgQ57Ze4hH1BgrkeVGr0rzU+vPI5dg1tFpJFJa9bHTwvQaqMKB 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)(39850400004)(136003)(396003)(366004)(376002)(346002)(451199021)(36756003)(478600001)(38350700002)(38100700002)(86362001)(6512007)(52116002)(6486002)(6666004)(2616005)(186003)(107886003)(8676002)(1076003)(26005)(8936002)(6506007)(5660300002)(44832011)(4326008)(2906002)(66476007)(66946007)(66556008)(54906003)(41300700001)(316002)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR03MB9163 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM6EUR05FT033.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 491f15dc-ce89-4846-5cc9-08db92178b67 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X+5kfY4bedqkpUx9MdTzRidRkhNIF4FQMd6cOHhXReJE94o5N1Bq94NSEk6WY5hrjnWD4bxbDNf8aCNcICuIEb8UJh6q2yzcD+fOUoL5X4AlhYqtWLTeD9xT+4yDxiCbeCcO0dSziCRxR1OAX04/BVC2K2VasTWSz8MQPvHkKjSlSsZ4kHmYkGS7oXR6pkyeeyq72M+f4nrHSAJdoaDBR1Hhc/Jzv8bZ/mSMRedPn2j35hCVlNrwQOIHRGBTivfJ1pItbDHJv0tC6Lb5oE+56Hc49oZyQkjVqqCHpKX//VGWdnUMSONLWipM8yDQBQSz+kQpnFs8Gz7g1kImC7eLXH16KzgQo2pUwseyj54tw0Zta/P7tGO8BZab6GKbBIvNt/Sz260OxN4kE7dMERnEo7PgZSl38QxxT5Pr5CLP7d8oFx2JHlT/hHLjBuTQVW7mpKyEseoih9k7EMy5GtHtjenUq5ClbyTxe75Uk5Bx7CbQNmkq4GbD48mqQXxV6WfYEqRGUO4DMZknN7d4vP+2XdAuyJJKKDx44Pfds1MEYncLEZ9emA21m8CBtz/Abeb6rdgS3+6Rtm1gzACSvT5uG+ENBjd6NE5iEfzRCOJFoMyWFW98qyGt2JGfjPthogufgAR/MXzE59n/jYGIM4PjqWSbXZM+PfYNUm4sr5lbAFXt7uWMVht5DcuP0AIDs/hQKvD8E9lB7t6fSARzbDqWS62MZPvuvwDIMBTYvrDi/DPvH0uzD6iVJSArwWgni15t X-Forefront-Antispam-Report: CIP:20.160.56.83; 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)(396003)(376002)(136003)(39850400004)(82310400008)(451199021)(36840700001)(46966006)(44832011)(6512007)(47076005)(36860700001)(6486002)(36756003)(2616005)(40480700001)(6506007)(26005)(1076003)(83380400001)(107886003)(336012)(186003)(70206006)(70586007)(7636003)(54906003)(356005)(7596003)(82740400003)(41300700001)(86362001)(316002)(5660300002)(4326008)(8676002)(8936002)(2906002)(6666004)(34070700002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 22:43:32.8382 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 894626aa-687c-4ca2-d2a9-08db921791aa 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.83]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: AM6EUR05FT033.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR03MB8515 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.8 at phobos.denx.de X-Virus-Status: Clean This converts the net load method to use spl_load. As a result, it also adds support for LOAD_FIT_FULL and IMX images. Signed-off-by: Sean Anderson --- Changes in v5: - Rework to load header in spl_load common/spl/spl_net.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index b2c901b554..29e72bc491 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -28,7 +28,10 @@ static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, 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 +50,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, 0, 0); } #endif