From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69BB1C433F5 for ; Fri, 1 Apr 2022 19:05:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DC348431A; Fri, 1 Apr 2022 21:04:51 +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="ATRK8XwV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E87598432B; Fri, 1 Apr 2022 21:04:38 +0200 (CEST) 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 629CD8430A for ; Fri, 1 Apr 2022 21:04: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=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hq5UxgkaMpAYXXXfuIj64GGXeH6GdiBxH57JWTGi6pJ/T8sZvGnyel3cLX37wulkiejky8AcvRh0myLBWiPPjQp3GjdCApEdFLOKlE9jEavuIok0/hrdC8nXCChcAHlh6QnqvRxFuTNT3KH7LRBeDUbwOTUpPyxSaNDQOk+MJdjrv1iEOdl9P3zuxp1R3wHAZVkypW6cddsJGaudJAuAZKVpYtLT5B6jw56XvzsiuU+W9nSYJFybmNAAlWDT4KyAhHxnu+Ug/mYiXe8sI9n6gi0qd/IJFMR0JZx7WXlV7TjEklXYpwnyAKxHwuzyKLmwxoFj8UBjazz517xQeN3e0A== 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=/EuADFG/fFPzRgnvQq1pX3uiLNItGGkqOEOPi3C8VfQ=; b=N0njc36Z5syWEzZ0uS9S1aTaL7mJjI4rxEvYFwt9+Bdt37myhnIr8x4BoS1kqHkkv2CjvpbWsXO1qYEmzLUp3DC54yriUuv+o+uJXeLI2kBjeSctGGs3xBLYK7EN8btTksI/2SxJ2asrBkrpn0FOMZB+c7RiR6gi+NSw6wTg/ANcSZt5AAfBXF9TYdMCN5vJkmM/LP1ysfCsqPZVVq86q4UCLDXKLSPnMleOC7GZktOzm7uBTWE4BY0ReCfFAAMgVRLqNRgugRjnUXJt84xcSWfWl6l5v1Q40IadR642G85boreroIw6prUhvqLl7nTjiQeRK7PrcTfbpdVMDSKkhw== 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=/EuADFG/fFPzRgnvQq1pX3uiLNItGGkqOEOPi3C8VfQ=; b=ATRK8XwVz7IBQxqTMQ3dC5n2Sphexwg4je0CKD8D1bYKGZ4ys5w8XT4PPyOtwFkK18kYA2Jq8Rzn3752IxyDNjyRr7r7mKjyCOweYsUlF4P4/4KtPnSQXmos4xZ85v4TXvU0xajoD+plz8WSbrvs/iTC9Vs0JCbMPCk44ciQQrvXGNrtrqW3cNSEK8uHnK90z2UhtwzGnsQOPzB8Ekrlbv7B05uz+bidtqWgyCKamuXET7HqaJ6Bl223pmcxcmP8yZdc8qhaWc/d8c42LiXABmJGXdKBIS8Nc05beHX+Mgftd6OzxOGnJr4ZVRWdvRe+OXk8xjsGj3z9Wmr9688FlQ== 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:27 +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:27 +0000 From: Sean Anderson To: Simon Glass Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= , u-boot@lists.denx.de, Stefan Roese , Marek Vasut , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Sean Anderson Subject: [RFC PATCH 6/7] spl: Convert nor to spl_load Date: Fri, 1 Apr 2022 15:04:04 -0400 Message-Id: <20220401190405.1932697-7-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: fb0efc3f-e9f0-4ebf-c1d4-08da141271ca 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: JtfJqCwy/ywDtxcBUXop/n65fRJq+UKl/57bA62mk+bzQ1rmcYpLEu3WSI65mM8753JReGs64HMq3gAaSvgXxWLgeXykrijnA//nMiWxrCLXkJjlpcnu5/E+Jp3RCwgSus9/hzpujzUO80a7F4arCjN8dcdvzmwMeFscR+3SLLT6pJEXhXkbzjFGn/GgF6FTCzorQ+xO5nOqDMmP10x/f5H9JCTw0jmo1uLtJYFw9DQ58kUt2ixlBbTrd261WoYtJz0oeEx673AImGiDJXOt1MEarEzoE+AJ673hqVLnt4RCE8LhKNKpsUwtcZzhxHIbQbESUWp/2eQJnTUF9Qk2OkkU7mT37A/h2cmeRr/+yr0Mg/2TnWFL5YYtMerHTwjj0KP99lQT24WQ9ARg8kmXv3egnLj1q6dKhj1wF8OkO5wu2IOUnJYYZBWnzRrHmAsGUjh96+VTxXSPqa3YkOuX9/oQMZZx1PM+bhhCdBI139SQXh5E1aS4PgyJwcnQTfDDj5R60INGLi1g5LUXLNESskQrJS2Y0Ul55ym+H9c/FQroqoXs6LZAnWezVCd3mX2mkAFPddJeGAxrhjyMP/LpJNm32TJAvjOLqt78EgqDidn+5KvOeE9DTI82vt2Z97u5ecQKUzH0Q3RmgIf0yJDjz9exwQxPRiynZUX5JgKQRXh1jXEgwsFJCprmBK0vtYUSgShCJ/tifrZXC2a0u2vnhA== 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: =?us-ascii?Q?pN9f8WZQYkjzL0cqiCH4VkGPM/60vijz3IZw4bSe4rCI4i3Q1oAd9Av9Z4zV?= =?us-ascii?Q?Tc99zLvsqyIU+cxm0T04g5J7QngTiiSUhQFBR3shMjDBqm5UYCXWuWl6CTis?= =?us-ascii?Q?9HnlCDd2TyCyctAB8iNac4rBSDR5uwEqLzqiy6fV9jhrvd2ztUpmS+uDInMa?= =?us-ascii?Q?90TksC7/5ibwBJiAtpXCzZcYrzhLog48wvytbNotydzJQeya62Q9Q+oQmmsd?= =?us-ascii?Q?vpIRu8j0JJp5S9NQqZxby+10GoGW/5al6LtIkL7OeNTg2NDbNJU0qAMXNnXb?= =?us-ascii?Q?j3azlXS5NcEU2YQM0sDIR0cxYyZjKly6hH2HyVsFeWAKiuI/0Z6JE74ky2Tg?= =?us-ascii?Q?mMZMsDtnAwMjjbuF0SI5TyhKemJNsrn99RD2dxWEcwMcj5YuaWgvWKt+HVpv?= =?us-ascii?Q?8fHcVz76knbvBuuI9mhJbXjMdSEnhKupIFB6ss97od+eDJRoIaH/R5/XPHzz?= =?us-ascii?Q?hB2egSGU/h8OW5c8p5GlStiXcYi5aCR07l+B7v3lq0RpjVVR31PP5qRSsDsP?= =?us-ascii?Q?pb9WzehEWFAh7wqGElhpqF8LmfLvhg6uAZ/r7Wlb2fIWfPxWZAe0EdvNtB4w?= =?us-ascii?Q?R1GkmrJ1g9qOOVMpPCCqDfOqmLviHH6Px3skIMSzQ243KajIMk8FYEjzRNrf?= =?us-ascii?Q?Yj51noXfQitzF/xAzpI1b2iWagx3EWZ8EgZg1QrX1pg4/q+xUPvJwa2VdlXe?= =?us-ascii?Q?pwasmFRu0pEmlX7WTywGAgmSxOqYan4NEgze7M37/qCQmOf3VlQ5r8X/nZOu?= =?us-ascii?Q?oWYnKewxjw4GPlX3/wvGBTYFRQYuCpbiIJVg+V56rWzGsEyYmVImaoKcZsbD?= =?us-ascii?Q?L9gVUC9Qsqw3kmC9CvdFQII0Qir0skudKtqI9rs46an1iTvYtpcSyGWEiFs9?= =?us-ascii?Q?g87JDnCQsTuRxK4XaMxBUHCVpc3poFX4wgnUx5G7vAOeMDcPK1mqcEV7m9Bu?= =?us-ascii?Q?vlsQk3+zULnEooFWSmxZ6zUqFMo0S8KyWKjQZ5ofl1EEnU0m2tIjvMM/X3y4?= =?us-ascii?Q?JxjQtoUYGYp8ef33ZiZ+X1xgAPQTGUTJ3vB+oop/V8pqMjtgdqvhYW7ZGVu7?= =?us-ascii?Q?yrxO/jdP0eDAKExve45qMvEvn7lZ3PJhlRDUHRx75xzd0ywuu5rRBI+Yij5l?= =?us-ascii?Q?06LPS/ws8uTz5rBRylyOZ+J2uUYXQIithPyu7BTp+ACEB3JdiqAE4JQQcK/6?= =?us-ascii?Q?Pu4gu4fRu0MyCsE92LZt91sU8bu3scrlvGNKOPF1okn31zgsKYBqn685r7uB?= =?us-ascii?Q?bDsPNkX5ETPdB/0bavWZVSxAFgbPuoPOcLyXhxdcgnrOVRbuNwMnGdqYraWv?= =?us-ascii?Q?6it+iZTsX4Zi2b2JcdsAoD2zFOwraOYiCwTGiLXl1nO5oGbwYogj97C26r9F?= =?us-ascii?Q?DxBfmnmbAKfwYwWy8WM8zqAlWTo0qZT+NOH6oWZwr0PSTCvYR/mIPYCapCO+?= =?us-ascii?Q?LQKv5WS6+Zuqklan1OjwHZJIOQDQZ42+28vJhoG2HEhpecKn1fuWAVytZIAh?= =?us-ascii?Q?5l/dwfY1fmerTnJHexs8LWnjEm+wOslSIhbO0K4JRE/8/wCMZAiEOk6cyycm?= =?us-ascii?Q?FqoABTdJlNtPmdYJkksjcCI9SdiO+EqV73iGI0s106Bqmv6N+xGWYR/GE8/Q?= =?us-ascii?Q?mfVuutIE9WuuKewRuzxr6RxHZ3u5W9TNqa6PPLbzgt4SY2MGS6MJXXK/x7Rh?= =?us-ascii?Q?35gmuS/wn9ECN6Qb6IYHt4vhBmJgsCkJlLunRCJ2tmaogNAmDhVWqKnCiGLd?= =?us-ascii?Q?6f0UduxIuy5VvgDNkE2SGs8mB5VZLdQ=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb0efc3f-e9f0-4ebf-c1d4-08da141271ca 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:27.8207 (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: V8/tIXKuxmd83KMtec/ZyUvE6JPA9viRbInRCh/o7d43uIIaU73uMp0bdZD5DGAYzTHdnmTR/+TG15rHJPkYkQ== 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 nor load method to use spl_load. As a result it also adds support LOAD_FIT_FULL. Signed-off-by: Sean Anderson --- common/spl/spl_nor.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index 0f4fff8493..90ece77af1 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -26,8 +26,11 @@ unsigned long __weak spl_nor_get_uboot_base(void) static int spl_nor_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { - __maybe_unused const struct image_header *header; - __maybe_unused struct spl_load_info load; + struct image_header *header = (void *)spl_nor_get_uboot_base(); + struct spl_load_info load = { + .bl_len = 1, + .read = spl_nor_load_read, + }; /* * Loading of the payload to SDRAM is done with skipping of @@ -91,32 +94,6 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, * Load real U-Boot from its location in NOR flash to its * defined location in SDRAM */ -#ifdef CONFIG_SPL_LOAD_FIT - header = (const struct image_header *)spl_nor_get_uboot_base(); - if (image_get_magic(header) == FDT_MAGIC) { - debug("Found FIT format U-Boot\n"); - load.bl_len = 1; - load.read = spl_nor_load_read; - return spl_load_simple_fit(spl_image, &load, - spl_nor_get_uboot_base(), - (void *)header); - } -#endif - if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { - load.bl_len = 1; - load.read = spl_nor_load_read; - return spl_load_imx_container(spl_image, &load, - spl_nor_get_uboot_base()); - } - - /* Legacy image handling */ - if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_SUPPORT)) { - load.bl_len = 1; - load.read = spl_nor_load_read; - return spl_load_legacy_img(spl_image, bootdev, &load, - spl_nor_get_uboot_base()); - } - - return 0; + return spl_load(spl_image, bootdev, &load, header, 0, 0); } SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image); -- 2.35.1.1320.gc452695387.dirty