Message ID | 20220726084123.2508-36-peng.fan@oss.nxp.com |
---|---|
State | Accepted |
Commit | 87650716eabcfc9341dfbf67c39ef01f9ca2d8a1 |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=ZSX1t+nl; 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=<UNKNOWN>) 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 4LsV361G9Nz9sB4 for <incoming@patchwork.ozlabs.org>; Tue, 26 Jul 2022 18:10:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DA998413A; Tue, 26 Jul 2022 10:10:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ZSX1t+nl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 61AD784125; Tue, 26 Jul 2022 10:10:37 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20057.outbound.protection.outlook.com [40.107.2.57]) (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 0137C8215A for <u-boot@lists.denx.de>; Tue, 26 Jul 2022 10:10:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aMIeexTtnYCwKScJ2tfXAzvR6Z3e0wFiT/wz2VcPq/iAD03isIDazYWGuE0zUYV89/Lkim3mrWhvgdE/veyQgR+yn4HLKodZB7uVlhK5lxGJXsm+QwPs0XQg4OXXSNpZVuyn/8Z9e4UaZHXr9uTaHvjwRNx2oMHzMnbfYADIKx5RCK9CroRcyqHbH4qhLOrH+KRi6BtKkIqWNH6Y/Xd0z/Elyq+hB19QG3QSc85j9+JJ1EzPjkxcpanKAItBVPINf/BYZ577zVvuys8ahTPkMJ/gn57ep7Q4717W0Tfm+MyBpdFod37hNoJqObQuDkgKhq2zeyQDKuOA09eEf4NTmA== 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=XDIglXTZ4FFC4oRrc5ljH+k8djWqW2VXoVYBpDe+ShE=; b=Q+NFc5GCwI8Ho4x5/dDDOHZqcVelnzKREaKqLQHCVTtqFN5kENR8mVO93rOtBjPkZb/rZKkNYtH0k6BnNuSZt0fMvBQID+D6GQGIdP+1uatZSeWP2oDyY/YsaGqjg9FeAGbnI9Vt0FG0Bkz0vQdILTQuuSoKPzCzj4aK5yt0/PUmRN053ggQB3AiwkWoY7SKUREU9T1W16m7F7JkMlAuCs6qC67c3eEzQR1f5Olz91swFWBPnUiexqb/50pUxkkutmfUnkMnKB3fmV4ur/h70yWlQMTReny22RpgSddPHCwUa1dmLqbmjyXHLa0FsenLiEpfP+t4gaCZ7qn4tmNZWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XDIglXTZ4FFC4oRrc5ljH+k8djWqW2VXoVYBpDe+ShE=; b=ZSX1t+nlJkKMUe4zmgdr8ptO11KddO7olpfVYmarmXTZvA3TUHoB35yRTSYCOco5wAtuXG2fSJ3IF8EcElrFwGg6XXt/9r+3T9cEXeryWbT1kBzKUJSrSkpAhfsPeISQ7FMNy+0WQ1K+t0032PqYNcw0cLF28TpJ6ir2FdlyTgc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB5649.eurprd04.prod.outlook.com (2603:10a6:208:12a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 08:00:14 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597%3]) with mapi id 15.20.5458.024; Tue, 26 Jul 2022 08:00:14 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" <uboot-imx@nxp.com> Cc: u-boot@lists.denx.de, Ye Li <ye.li@nxp.com> Subject: [PATCH V2 35/53] imx: imx9: Support multiple env storages at runtime Date: Tue, 26 Jul 2022 16:41:05 +0800 Message-Id: <20220726084123.2508-36-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220726084123.2508-1-peng.fan@oss.nxp.com> References: <20220726084123.2508-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0221.apcprd06.prod.outlook.com (2603:1096:4:68::29) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85e629f7-7667-4397-652a-08da6edcdf1a X-MS-TrafficTypeDiagnostic: AM0PR04MB5649:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LJPq7h0GmflXRKliIsYxTWhZqJdIWmv54yFZpm069SXPc4H7ZaiSCEeHC/iAJDZPqd56deVkkhx7fZFi8QdR9YhIGTAZMYbE0P29eYS+tONkcBuagA+Qfp/qNJtYZJniu2gn+BcVlx1QP31Vezg0BoZ0eKhMcDysLnxMf0uk2L6PXBFFzboDi202L0ZVa3TYcFS9WydXVwTgJS7LLlY2jn3X3SeEbWDz/Ul7+ibA0zdrluhaTDPMBl/5HG28LvFoTlNzQ+/QZvHDqDUi5+W3eI+al508gkVkJHKxjdgN3zj59QehQF+34NYtDtXjiag3p98bdKWH8eHkGlrCP82r90K9cgVnKYdzzsiZTo/EV4quMzBUglgHbpGZQjwB28wY/2+VvRYqr7NmuXdFHGvsaOl4gdbOzghAskXEDEbDXsBS34WbIb5fyTGQO8AZJM93NX0Y5/ex+AtjSFVAcz/hnIk9llOkUNXkHkbRHUw3wrpu277eI0TB4lWAySx8S4/ALmDhy5MoylckiYcPouhK/6cZeoqahHwkw0zkWgyCvfZ5VSo6byI/xDQ+Em3M99AvxqS0YrQnj3MXZK0T3ojJbSqt8dxGdoK2zqIw/scwLBHndZCp9Uz+2anRyX/MhCp1OUHeWrj7rFr/c8ejpM+vK7QY4Mz2OpFuj/INPXuTnHWdnVD2hsC46L5wT6rZJetleUewFZpfnF2kL6uukBj5a9eXbWqIcRsuRQ8zsSuA9Xu8apsyY9yjTk00EVHCIPx5V3ChqYqzvUshvIhnyijYOK8X/GDRTtG20Lq1XWnv1brYw3ZoZnHMELyQvHQQV06p X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(366004)(346002)(396003)(136003)(39860400002)(376002)(66946007)(66476007)(66556008)(6862004)(8936002)(8676002)(4326008)(478600001)(5660300002)(1076003)(6486002)(186003)(2616005)(6506007)(316002)(2906002)(6666004)(38100700002)(38350700002)(41300700001)(86362001)(52116002)(26005)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V6orYFHDzNMFZtmAYqQjv/Vk7UIS89xZfAfNhLvjKW4e0Ey2dJettnwHrXwaBonm6vrteqfE51czJUr/emZ+SwI9/abciWfUruyduDr+It43+cvomyqwRf9S46HrcJ0SyN5fs7+vghcjDVWzYKxQIrPfUxnynQBoTmVZNESZeNgRvgN06Rv9sZr+IzZRd7f1agWsoLAGHGMEnq3EskRMKBQ3bKzNKP/fEKsuRtrWrbgND3g0OF3E2jmUrOlJGpInafoAZVobkHy2lfj8mb8Z+1Y21aV1WvcClLgGqd+dRSSp5wQB9t/624Xf2BEVAU0wpdbGUnn/TfZ9AYYePkO7jaGpd0AdDYgNmcdS3kwEADy1kG84jfXvHcYkC4ONj8OmIPOJlQaFxVGugDZA4ilGGuQKzX6PXVzE1PV0uIJwQPc7U94gGXW6nvueim3c7+BzMwvERvXsZ7qBfXXLmRP2cTHA63QLB7d4/lLOFY7YQdRIknbe5zolKD3SE7J+Wv3YoVZwlvy+MPhUIfCRazjhTr9t5CdgYIbuwKhA68SOXOKQUWk2StJeoGsGiKWJ/2nhXsqfRcUQtl0dvfI7PgwiSL7kb5TfHcy998jJ6G3tl5Bg2H8R5atRo9GfHKzso01NCWVFWMX+uBHpyJUGOKCpigzo60oQhjLavs0dNuD5X0IMUDS8BbYEnkL1sxUuiKBRZXeL4frONURpmkMKOSsoEIINSsl6Q+vRWsGZukGFnCxiE9yYyiaMgdzQUO3bN+ji7My0L/cr8AK7N5KJHXFULHGNd7mJqR1wuBMvcYsfF/hFzBH7KL5KV5+rHQxsfc08J5G+Wd1oYfeWFUZEkltReLAUL4++ydWhuBExpDorbTBR3J9/gIMkvf5XKVidu9cFYKpgYh8Q8nE8qm7K7zrAyvC+ffK1+kK7kVYhk6stmGphHQW4wtgjJoxIsd1W0lKw0ajsGl0HQCpMjlo08lRzzyfJPtjEfeSQXFgw3lo/ATk9G3qyfOmRpYIx+wgKppbETSqGXBl5y5Hu/xD1/tZZumcQ3SHtH8geTsMSS0949uYpA2BC5gesFMKgfFH+J3gr2V9ioE1/bhPtSlF6LSUxnQNdXK2OnCLzORRXcNjBHi0z1rTdS8ttgB7P+hvNGprg2QEWcDMQNsb94DpZcAuRsQhJN0TgItwGY9EJ2v5s3bSzJXaVA1R8WNh9Bo4gBPGr9XP5KSG8KEzWgl+acjplazoMJo6KG7eC/t4XH5drvipquKFBKxlfXnGuwVWi3DtBYjM1/8p3AZKeACtTc06ErtEsgk2dnEj5nYB4omclUd72D6k7YuFMB0llcA+7uUBtgBUUO8frKtTELEYumcK5C3qme31MmksFxjWYH8GOkGfltuQD2QkZLK+axP26DHxdbgGgqUcRfTbRMZED7dBLFZp1BO9ZP8pHtRAwzN9ZR1CrsMu3pVp5waugAybIVj8zNDj55pb06jYnWEmyODB/BX673UI68GS58y/9phe0lB6Slr86w2pXChbs3SJ4XcqLqH9uFOv9RFGuppa+THFZRwJgozZAd0kGNJ1QUkhySzNi+tmlx+LbLdafeI+bgBTs X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85e629f7-7667-4397-652a-08da6edcdf1a X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 08:00:14.4849 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: keAKsjGnpWxbeRWmErQ2A8PhkMXggQzjvXlq1sP66IzZ1Aw+YrN55VabgPYjM5oTszUPa/A/VjjIMxJRA4/Gwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5649 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.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
NXP-IMX pending patches
|
expand
|
> From: Ye Li <ye.li@nxp.com> > Select env storages according to boot device at runtime > Signed-off-by: Ye Li <ye.li@nxp.com> > Signed-off-by: Peng Fan <peng.fan@nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index ca88271564c..797d7a802ba 100644 --- a/arch/arm/mach-imx/imx9/soc.c +++ b/arch/arm/mach-imx/imx9/soc.c @@ -288,6 +288,40 @@ int timer_init(void) return 0; } +enum env_location env_get_location(enum env_operation op, int prio) +{ + enum boot_device dev = get_boot_device(); + enum env_location env_loc = ENVL_UNKNOWN; + + if (prio) + return env_loc; + + switch (dev) { +#if defined(CONFIG_ENV_IS_IN_SPI_FLASH) + case QSPI_BOOT: + env_loc = ENVL_SPI_FLASH; + break; +#endif +#if defined(CONFIG_ENV_IS_IN_MMC) + case SD1_BOOT: + case SD2_BOOT: + case SD3_BOOT: + case MMC1_BOOT: + case MMC2_BOOT: + case MMC3_BOOT: + env_loc = ENVL_MMC; + break; +#endif + default: +#if defined(CONFIG_ENV_IS_NOWHERE) + env_loc = ENVL_NOWHERE; +#endif + break; + } + + return env_loc; +} + static int mix_power_init(enum mix_power_domain pd) { enum src_mix_slice_id mix_id;