From patchwork Fri Apr 1 19:04:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1612367 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=WjwyHhaM; 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=) 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 4KVV3r1VJZz9sGG for ; Sat, 2 Apr 2022 06:05:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5476A84311; Fri, 1 Apr 2022 21:04:37 +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="WjwyHhaM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E2ABC842EA; Fri, 1 Apr 2022 21:04:32 +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 EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::629]) (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 12955842EA for ; Fri, 1 Apr 2022 21:04:25 +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=oY3vuKzaulmXGVy0tDATQobSdjL80+wAzP/6JJdfSdzT1KpUaI2BJKHv82qqucwaBTmxbw7TiM4jxm9Q+I8PC9zNmYVcF2Ttmq88a16xFC/MR+fh4jQrRqLil5G6JqL1PxPrBmFmdOaHBrayYn9MKiRqA7n+ue21L7P6I0Ed2lgKhtuDcxxNxqUNoyuURmY24xJr25vkyOTDfefhCX5LcwvDXAMlN59x9rsMATO6dfJ7z1wdVRU1KOoA0YGyPyyGOpW1iKcK3isgwLV10yWkTKa/fzKYPHHcAYczbsUPbUHkn68Z3X8lNt3Tptm7TlY7s++3RO08Au7VlR+zY0SCGQ== 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=S1Od8wILETK3I5eK0QCcJYfVs/mvFimG6huhBWrSJvU=; b=aYBJHyffuYflO3DBcjtiPfVG4lytu63757jwYEeWfn21Wx7qCoeQp9/YnY1s5hWbXp4vKonKQh56x2x43wUIA/VdM2uMgKSSW9reew0SYOfE5FIxheJJt2gI0oqsEt0xnJJZGF8B4JCrEl+1GhOBidDG+EXPpFaXd2FjVVxjzYOj91i/AUI8PUBGqADbjau/eIEkmO+5Pt2TT73xCJqtM4/6aDMQ/+ZMd743NPkfqMXbIQArMHp5lxgAsjMloY2YvtveQZCl3Lk47I+HZ+u5zozYOvUpNFgi/wFJS3ARPAn2uV84Ni0sB9/rWlZV0rgKPXG4yVxOGyANrKsCfqKz+Q== 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=S1Od8wILETK3I5eK0QCcJYfVs/mvFimG6huhBWrSJvU=; b=WjwyHhaMZBHqXXQG2gyCZ9XzDVQJmE9u3zQ76GX34DP3CiUG42n5kHBoqOlYnayxcNTrPFFc3xTuQZZ3Tz2yGJvlfF3qyYJTWYCTGpj9y2UOC0LiHOhiH4P/k9h7KIvA8M+8L+IUHeLVqAsuV/2/PzNZZRPYs+1i0MjPfj3b9Q9bzT//EoAjFg00SZcnyK5/J6NuLXYxG7uDm9H9CCFGZyqbhLb4S+8swwHCufteozFmwy0FgEM5N2sYGj6O7VUgCpNAnZtC9asnH0du8wULSXyDHOmX/rARPR8VPysxGpj1RpY2QEUbgtJ7Utvyg7/RFbbsn+Vwdp6lbPXS8jxcDQ== 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 VI1PR03MB6463.eurprd03.prod.outlook.com (2603:10a6:800:193::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.21; Fri, 1 Apr 2022 19:04:24 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::356c:789f:d20f:92bc]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::356c:789f:d20f:92bc%7]) with mapi id 15.20.5123.025; Fri, 1 Apr 2022 19:04:24 +0000 From: Sean Anderson To: Simon Glass Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , u-boot@lists.denx.de, Stefan Roese , Marek Vasut , =?utf-8?q?Pali_Roh?= =?utf-8?q?=C3=A1r?= , Sean Anderson Subject: [RFC PATCH 3/7] spl: Convert fat to spl_load Date: Fri, 1 Apr 2022 15:04:01 -0400 Message-Id: <20220401190405.1932697-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty In-Reply-To: <20220401190405.1932697-1-sean.anderson@seco.com> References: <20220401190405.1932697-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR13CA0001.namprd13.prod.outlook.com (2603:10b6:208:160::14) 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: 0dd45164-8810-42d6-9781-08da14126f8e X-MS-TrafficTypeDiagnostic: VI1PR03MB6463: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: GVGaOpKzrJm3zGcnFDiuIe7V4aVTBzxNhQjehgbYz7Ich1oRcpWfG52iIa0sPpldPRexyftT4D7endh79leMywOdoQMUoNPNrkGwlPq5J8DnOIqBSe0cD/kCk8HNAibCpjc5gTW6SoOM3/aRPSJIH47vsrxtqzKmVKp0O+UKAQ8hMe/RXzpl8L6cTe3JebuBkpXs7HS6BvWI3JCU8rrCO2hMRNoGd9+Jco96+N4TStNwmLm9/9R0uKxlHg7fQJnuwADh1bymZxx97zh4lsIJ5HDeYeWSJCcK+SgKOmWksiupBbRBXh5Vn5MaEF/FOguVW9LQo693WNkDzJzt3MhRclXDZfGFA1rlCwnxy2B4m4fOkpjZ3KzEEolAIfQCszUddXL+pa9sU05NRzqLE36iVvMEmCxqEsPdaC6jLpY4yLDtzsTPuF9fR1GcJ2X8QLOPokedDduX5443/81DK/AYcfVZ7AgHY2CnwBhOpycM53FHKErlRR6TpyvAGJmUwBiehs/TdeJOGnKtRUH8X8m7af1uGYbUGaf8Z2xRO+bCvySHwT+du8QOowD0tN+aWG+14eOAD3ktfZ0vbe1peL/5Zx/YPqs8fW4h1d1UEGa9Py9JFR4xZlY6byAoVL6prgFyyZG+Uuzv1/PfkKpmO355Rr4ItD3E1ZaZKtIsuRNhAvz7g/uJHE48XxkOQ13jauD2ouFdd5Gl/7WF9M+fj2kiaA== 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)(54906003)(6486002)(6666004)(8676002)(316002)(66946007)(6506007)(6916009)(66556008)(38350700002)(86362001)(83380400001)(66476007)(508600001)(38100700002)(6512007)(8936002)(52116002)(2616005)(4326008)(186003)(26005)(107886003)(44832011)(1076003)(5660300002)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FEvNjHaF3BGEMpWVyoxAFV0tmChYzQARtbbDZeL3fgmE0dQHK7YGKn6PQRQQXiOgzuCcWNIVevRWhM/q0jCiyl+h8Ta25WGO+RX2aeABPMMzw9RstVrH+4KvqPzTPOZr5iMfNkPfJmeNwwRj0YwajOrYBYolQUuAJ1X97u3u7LPtBdmKszaB82Y36KHS8CuI9ByWbaTGM21YGEcosDpy0hzhn1gj1LIRzJLpUVAJYbLFKlv6x61HpyVivYgD2FYVPkvxSx5CSyaeVn6lAPOSlX8pie2lzsnfa7NFhaO/fDXL716LJCkFbc95f6uxrOtgxzG5nytAxmNOd1HgaAd29zzvOJbwHAeiSY5/vnbUotUrl9YjXSWX6PXYvxTfPp2gvmk2zAt9RSy0+nDO4+i8gHTq3+YfcROzL1OzYZX/WWAtE1A/tUADHnRijl02Hg/b7BC6ljhQVD1arHHvrgnKJ+9mOnrAWbA0QUtqFUOXcAUe/QBq6O0+DHw+A19y5iIb2xrTIbAJqJ7df8Q5htf7lxabfRjaDYhqneIEUGFv5/2HCBKhMuKBDb3YlDi/G9il9EMLBjwDWKlmdf5e7gS6y6YGzLSsS1AAe3voIERNxxA9OdM62zAGaS/IbX72khgB0Fk7Or4Mn766jwRWWbRRq1h7fLNNq79xzIEy5V/tV7Bd8/I6Hu7w5kuLZwsmjBNsDKi6QAZpZPWzCt3SRZeBA/q6M/54r8kgLpzU0xOSEFsZE4ZrC/teXRcqxNARBS07mWQI0zAtSESMn9fCROsVbgkZQ99iVP5s8Uwm24UnmZ4yCC3rZA0SZhflQRSQ0okSL5pSfXCF5tosF/FDzNXGKr9PkBqn2r/XlP21yY1Z2zoPRbzE9+2AvtXcTLF8uWOATHQTguC9yE8Kdjiox+7cfnnLEX5mvhoGpE8/ce8zKcQe2gFgZCE/i8z6oTw3xDohgz9E/WmEX+JtF3dsfKqgCy7zawnMBejv5HgMxSv15gNsVqEhtaV/SCeQ/ZNgDRCCwLYC1ZWytG+/WKRFHwyD0JKqF61wftyvXgP+byKQvoKrKrrkdosbAKRsqqCZjjsfh5DFPzFOMXCOiYIpKCJrgct9RQULyrZcA7A5tekF2xwPYRiDGCqLEm5lGOxijc6ydHKjhfqG1t9Oan4DediS9I6ImxUaIJHsS/Q2Ia+HEcw7C9Mng/fb92ym09saCEIjGAucKY0zZKPIl3YDM47lki0D4+NmkIGHInXKYt9dsSF2zeLkxSghKwYdBeiPB9n57kSlAjAEvhRy5evI8pqMYHEdOYWXu1ikq37g3XG1TdmFKV+PEI/M+nFWo8DHlcWuDBc1kKoPeTxO2gMLoBvV66adQsF1fLQlMPDpqhKVei5BOSPfrblgK7vHgguabNyruMkqpzh04tkTveYSGryIXBrGPzEnP18RjiDHqt+u8klP1bEP+BbI7jube2C+aiHC/LzW7Ssg+KWE/lCuIPi2sn/dQzmeQ2xlim2D5XXV1W8HoBUsuXGqeHBFKiWmAZ5L2ebIosg4+O3UtnUAue61jSr6BKm5dACLdLMwuYFMPbLk5TEfrs4hSlBxLMVca7n4eHEcDPB36NlW1lAbAs6ThQF53dd+VyzTPMbSCpeI4CfuWiDnDrIowXYJ919J8nTWPTcUBh3vUPh8tFWAQC0cQ0rl6QPyF4EoL3n8lGGktssh08ALEAB3v+t6BhYGjsQumwd2lVWeR3xOOuYCsCGtm0bDrNrB37Goo+zywMNbMQ8= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0dd45164-8810-42d6-9781-08da14126f8e X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2022 19:04:24.0866 (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: tUPYwYqs3OYt3v4FjmAvH2QZsbPtUMNodEZLYw7BK9OrtwI5ufBJaIR6CYlEbgJm4dnKypcAYwpUUYXfpdV9IQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6463 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 fat loader to use spl_load. Signed-off-by: Sean Anderson Reviewed-by: Stefan Roese --- common/spl/spl_fat.c | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 5b270541fc..c092eb3481 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -61,6 +61,11 @@ int spl_load_image_fat(struct spl_image_info *spl_image, { int err; struct image_header *header; + struct spl_load_info load = { + .read = spl_fit_read, + .bl_len = 1, + .filename = filename, + }; err = spl_register_fat_device(block_dev, partition); if (err) @@ -72,36 +77,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, if (err <= 0) goto end; - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) && - image_get_magic(header) == FDT_MAGIC) { - err = file_fat_read(filename, (void *)CONFIG_SYS_LOAD_ADDR, 0); - if (err <= 0) - goto end; - err = spl_parse_image_header(spl_image, bootdev, - (struct image_header *)CONFIG_SYS_LOAD_ADDR); - if (err == -EAGAIN) - return err; - if (err == 0) - err = 1; - } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.read = spl_fit_read; - load.bl_len = 1; - load.filename = (void *)filename; - load.priv = NULL; - - return spl_load_simple_fit(spl_image, &load, 0, header); - } else { - err = spl_parse_image_header(spl_image, bootdev, header); - if (err) - goto end; - - err = file_fat_read(filename, - (u8 *)(uintptr_t)spl_image->load_addr, 0); - } + err = spl_load(spl_image, bootdev, &load, header, err, 0); end: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT