From patchwork Thu May 5 20:16:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1627248 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=FP7W6N0v; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvQ4S5xjDz9sBF for ; Fri, 6 May 2022 06:18:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 327F484065; Thu, 5 May 2022 22:17:30 +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="FP7W6N0v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFDD084011; Thu, 5 May 2022 22:17:24 +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-db3eur04on0625.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::625]) (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 DBE4B84057 for ; Thu, 5 May 2022 22:17:15 +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=gi0ZDvdNp75T53hrc9ymo1DtUkuhT6VOztA4XfNm+ecyQ7rd7cCRJLkMsc4jXc3+VbNfzhBGV+/DKV04PzUgOiI6jKZbsm1QBf15aMfxXo2+5pCg1vGH5HNx+NJ9kDT21yq+hkkF6VWnBp5sMNke50KnUzSTQFNjl0PVyboqSJK+1rPfs/9YEGP3UFsFcexvm5nJydOzMzLWpcMv1U22An9VzDqWrDdCZx8ykdGpViv0zPmwbICn5Xvd0AVHnsC+0bA500rLHemfKjoE8vH10xlrcv2ZlyOTRE1lCt1PgdEg75jXitq8Aj6tYHhg03NodI0T5Rw/rj755ZhswHwPXw== 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=FsMSvck2DKFBlDDze6KMFN67Deb1rfERr+t8wIHoSsw=; b=fIn5kHmm1W+2H70hGRFHc8TOWe/mWH90YdmYcFFrI6660rEEpKerUk8Axe/qu96+gNPLljdB8Nfp5YUPnMb+P+6Mn8/IbSisQDxsoVCnaA9mPX1jm/u15okV2YX5W+OOkZAhH/X/1OV2/zY0Z4+ATbVeDu+EFW5oXYvBfT6uCjFnmt6FAsVZtUAFJrYujflV5IYcTrflpHv0znF+P911PbciEilpG2egI5BHO8jzvYhFbiNKSJ1UUrifJADZGx17PqanpGOmaU5kcl/0opKj0IPpySLKkSp/mZ4H0YF9OWn7W/TJQ2LWi3v/mCAJRfUH/3GYQbmUjOAppoI+cKC6rQ== 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=FsMSvck2DKFBlDDze6KMFN67Deb1rfERr+t8wIHoSsw=; b=FP7W6N0vZKvL6XZCU1UJXq1s1bg/nuFQ/6sLVcrsUz0476hcjn6JEtj3CYC5Aje1W4rq5KyKCcdPz70IpBmKOp/D74sYtifr+NCafjx7/UHT0Ie86l7HYGdQaRau4AyGQuYWFLRLx4UlbRheThIeU+YwDuUgybE8JFOWWkDuRLhtbbZ04H4j/gmcPD8pIvYM/I7hVFKFsopbptCRN7DSzQ9g2wgc8ecadYqbmLtcEDgGVwnVNm1hjIOhyAue9WS9PjGmhn9cV7WIamSt2A15QrnAgbma2Y0tPjZ/WxVEq8He4FYDFnUM6mwnAlT3NhP+/Z6P/1QRi5eXqB6wN4iJqg== 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 DB8PR03MB5676.eurprd03.prod.outlook.com (2603:10a6:10:10b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25; Thu, 5 May 2022 20:17:13 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::a9d3:8abd:3f5e:a0c%5]) with mapi id 15.20.5206.027; Thu, 5 May 2022 20:17:13 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Stefan Roese , Marek Vasut , Simon Glass , =?utf-8?q?Pali_Roh=C3=A1r?= , =?utf-8?q?Marek_Beh=C3=BAn?= , Sean Anderson Subject: [PATCH v3 5/9] spl: Convert net to spl_load Date: Thu, 5 May 2022 16:16:51 -0400 Message-Id: <20220505201655.645692-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220505201655.645692-1-sean.anderson@seco.com> References: <20220505201655.645692-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR20CA0047.namprd20.prod.outlook.com (2603:10b6:208:235::16) 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: fd72b7af-9e34-4809-9305-08da2ed43e25 X-MS-TrafficTypeDiagnostic: DB8PR03MB5676:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jr0hniORJLEu0Zuv52KnBDF8WAOc95NvHtgJAKLUqFWy95o9x+5gITboOZAKwYIxUqDQpqrJdjQafO+igkjDM7yeyWi2IznFMOxkEwqjqDivjHuXbgYMMPz2od9jcWFkd0LvI3Zr2k/NMnuLDcxyUu4kn528uHrwpq0AXWPZzK63bZ1KsO9wTlAjhZxvN9Mze4IMAZ0R1TJiLJC/mYxM/GLmji9xkFVRhefzKZTb1+gCump0PXq4kJULQfDNVdn7surUl8XA8Z45vzoS7QSfFY3DH8HSWdRfYIgk7Y9/636S+LlYrFDwYstrG1b1c2uaXBzX5k3bh53fyYF96gFMdXhy7CssF3r+3BlBsZ4MirackokILMs26vXf8xLhcV90GUv0i2ROqxnkXd+mJBp2f7SvismpaiALl5pI9g01Z+GvJR2wuwa+oM6PojOcG6l2lgrW3C3Yu/1ZwxffCwmEDK6gla0szAvBH9hg9aZPWfaVwmKgYiVA1ourNEV3UnBzw83mXXzuW/4hmWrCDpM2E44ejFZiy0Q0jo3nFDGvh2Q3yb9k2GgOE5isQ4vPwN7bd//lx0iAYOvJk6UsMHr8qGVUpKjQRfC/9e6NSF2x1E611CFZNQEpqbNnztYlM13V4m60waWscPvJYHA3E2ZzQ1UVPozuWyYbBk8kQl7SpdbRS48ydTzaoEXOeFYFa+sAqzg85lgxKCxbGSKxaxlijA== 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)(86362001)(1076003)(4326008)(6512007)(54906003)(26005)(186003)(2616005)(44832011)(8676002)(83380400001)(66946007)(107886003)(66556008)(66476007)(316002)(5660300002)(38350700002)(36756003)(6486002)(38100700002)(6506007)(8936002)(508600001)(2906002)(52116002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uXrGLKR/eEU68GjbOy9yZXzpVoBj44w7dIsLvGKNN66K+iz2qBpRHb4A+P/Tlo30mfx3zaVEeo9bqz0/RMeq6k122szinVYCrA9QLx52LCQA844/q8X0qh3iWSTIieUhhIog7S3a2z29N0bo5gshnyNXhNwEV6Lo4+iTfHwRrFexEtV+wvws3ls1WSobLiE/ndqHA7wruyhGPuALCk25DWpkJNvL0nuNV0tpZ7A59Ww9iyfPnc+WldfMKr99qK6fpi3R/2g29EErSVA7tqdlGWVXtMAiq2NP3YGJdNa3S8RSMQsYvQMAN14dakb73V282m6CgCsJNgTRbmhq8uixJhCk6pp9oHkKoJ+/+DAnLtTLkalnl2f7/VMvCi16m+mNrvLrVr2e4XsEg2Yb2Ud9h/OPWwb2qiLUEVsMjKpvH5NWL0Z1AMPxkDIyUP+zzilFxmFgSycCn76I8fX6EU2LoLyORtk6AXNPJgi1CjNBSGo5HWiDZcYHHLRagm+eKmWcqH44eNKq6SvUk2Xj26wbAutlJQhqlXbp8z7f1F/tx0P+WeNioCL7rN1y9Tazu9p1RrQo/kqyFaDz2FCF7SyYxpYlov7dRQwLJY+sMC1BVnUnWPxnwlHkeJ1Hp+oaz9Q6aZIXM2YFcVeuWgHqakF8L8iPrc2CyiRkEXcrpuJebYjqTO96gUkMg9/KHgh8ASNVfIsbyi8NiFdp3URjMp8hEWDF+c9pUzMxUeQMOtW0sg68fjwW5eorx/0OpSDY5hRH0wcNmVsKSlJWO6py73Dc2voLMSBjmoyrXVBDYqURVPvEpGSNHhaVn3TEKu2dL/WcMsjP1aA1/uOysqW1k9Q3lwr9YIGeoNSGUNjQmcxig/0uS4lYXEz612aj3aDE6HlrQFnl6+e7JvNrPd1oQ9CcoxA75R+p52ozvwz4vgJhW8/wDR6+KfzfME5d0U8w7qQ6HAdNrK1lUTVOyxyKpUKQogj32cLI86CzANvkZ8j31OnEQFXKOiFfoLW+ljmVtsM1V/wGAlCxn/9tcfm6WUPvH9fsgdmxCYnOe9Jx7K1R/Bh0Ds8eKFY4P21OUvPD+vWrXtyXobb7xsVZpMKeKmPRndVnp8h6OKdFwbXmbJEGGo/pHyUyFKCwCF3VTN6XGltq8eau+7Nnp43QoA6QNpTvGdSN8pPkQmsRhZ2ycp+oBjMzYet5Zlae+jG0RRaOk147EhI30YEJzso1x7a3UxlxKuuvtUHogj/d83gOHDJVTjFWPfhwWfCdKjVgiO0Pgl9eoEb68ZBqs9t3sIB2KycfH0QmLe8FuGS3/+cRCCwg2RTZ9UEu5EjyFNuTEpiNns7AwH00nOWPdWaso6ZmHUQpm9EHrgwepVmeKw7gCs2AYGkqbkGPuJLvHKCz3WiZ3hcGMwjQUWbZVxGCpRgm/jaO49qbgJ7bvGbOg8UZgelf0kTOqw0NCwrttN0HJdgmHTRrgcaxtzslI6SPUFc7f87nIN0COPnk1q9+V2igR6F1H8l5t6f71gFbWgnUWj7sl0nJPVqF4PhJ+9j77OLObn00ljic3DUERqKDb9LNzirpX9Xm5fnfZ+vxSB69N/zWxFGnONg/SdlD4WzsdEQju4Gd0G7G/9URLDVr0RMYR6nTeNpFjuTe0dUXe0i8PgPHSfqA3/eALYi7gtQq5ev5kqPcl5mL6xCNmAMJifmKOfG4LPMqvoNGSsOEM49yL3taFbFvD1ynZT8K/w2cGGxf47ts4gmKzDtcfmokG1eoNzo5yzE= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd72b7af-9e34-4809-9305-08da2ed43e25 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 20:17:13.8815 (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: 8ETPbMDdVXx2Le7ztf8gdEYDXlMMTkG502uNgoLYljrRjTkhNDugvGRKlWyj/wXeA7yckVu3tbbfMyygJT61cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR03MB5676 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.5 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 Reviewed-by: Stefan Roese --- (no changes since v1) common/spl/spl_net.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index a853e6aead..3b4374add6 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 image_header *header = (struct image_header *)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