Message ID | 20220214124735.25580-27-peng.fan@oss.nxp.com |
---|---|
State | Superseded |
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=BJwEne+R; 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 (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Jy36C3b1Lz9s5B for <incoming@patchwork.ozlabs.org>; Mon, 14 Feb 2022 23:13:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 358F083C1C; Mon, 14 Feb 2022 13:11:48 +0100 (CET) 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="BJwEne+R"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 85DC783BAA; Mon, 14 Feb 2022 13:10:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::61c]) (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 0822E83C2F for <u-boot@lists.denx.de>; Mon, 14 Feb 2022 13:09:15 +0100 (CET) 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=BEe6q7jJWXdLqhE2T9An2XSKLiat6QXDFH+jPszDZJ+u/BV/YMvYfYBoXYBT90kdJ6dFd/4V6KeLc0g9Ub5qdLKWElogBXZBm2d4MLCCbDTxvzr7fd10QPPBE6Z8I1sh+JwLD9yBwYvxX8RqCsUwV5cmLPaqWZ/6nNsf1Z4lfs6jkYf8F/to4V3dcnYAx8Kr8Po1f2LOXrlSYipPI8AiFUbKvW7PuQhCKkpZfdb8coZSmkiNctX3HkzfgLLgxDFsdORlDxthWPKGRnlHZFZaZM84aI+TbTGvkF32l7m43fSrIQ/hUiHcybXk9IZxsvGumhsdsBnUOtNvO8koNKlNUg== 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=KHrH0j708PydDqOm5GRC8dhgMrdSmTUFzMNzq/OgcVw=; b=cqY4SFJ56bNYdRNlWzFKjgxaV2EP4Gd3hrzJJDIEuWnE+qiVqrPV1BFGU6Mo1HM7835FqUBRtCOP1jyIgj6doxmfw8izFaRQHqL4Aoh3jjcyOrAnxUdt0RYQXejD6l5xvdiS8t2+N4qPZPF/sMQp+YaTFPhCvR/iXYJmZxQABnrqheNZOU3lOuhFS8Q80yUWTJefZE47px0/yrkhURCDUDw7MKu+YU+YyNswxLn8Iw2+zxuThgfaaVOtTBnmcZqdO82Frar5WhiJErv/7SkVFQY/VJhW6DZCpfzU3XHF+BgbB+IxsHOepUt7EbJS/7Tx/X0hg/S38usfY943XPkmzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=KHrH0j708PydDqOm5GRC8dhgMrdSmTUFzMNzq/OgcVw=; b=BJwEne+RjlDfxZ1ue/pLu9tdqA/TBjzqbrsNhkJIrmSyySkbmIUJhTh3ptluaSEcrgMDhiu+OFWvvoEOlJPOaRVHSXHkFyam4Xk5TvD9B1B39w+iGSZcGUqcKD6SXA5zS/SIOCzRMtrzPq7SgfrGeiIm2KC6h6JuSYVzi0HBBrY= 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 DBBPR04MB7980.eurprd04.prod.outlook.com (2603:10a6:10:1f0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Mon, 14 Feb 2022 12:09:13 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::448c:19d:ca9a:123e%7]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 12:09:13 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 26/27] imx: imx8ulp_evk: Enable multiple env storage devices Date: Mon, 14 Feb 2022 20:47:34 +0800 Message-Id: <20220214124735.25580-27-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20220214124735.25580-1-peng.fan@oss.nxp.com> References: <20220214124735.25580-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0165.apcprd06.prod.outlook.com (2603:1096:1:1e::19) 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: 9023b01a-1ab4-476b-9a36-08d9efb2d060 X-MS-TrafficTypeDiagnostic: DBBPR04MB7980:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: <DBBPR04MB7980AE9D4C282E18EC207FFEC9339@DBBPR04MB7980.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:2150; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xAGVPpekgHx2HjOxTqpM0EaLHJxEintf+plfzQ9iiBc8aqLevYO56fmqplUvn8aope28/j5dOPxStEzKksYqFBQf4GtbkDCAz8adF85dUgo6zVsrnGJ9OBc9zbMx9ETEw4lf/snMvauOpDPILrhFhV/P0rc63NgrBuySnKwQ08ysyTu5CclSW5YctDARYgk7Fe1bsb4jQu1d+tvAgp7wvoyy6981MR4FmtF8war1zt4pBgKhdftQfDHcG6dLAuOrSD5/6+/aN3kJgiWH7HTD28GvCpfNH0bJmxdriNh2P219utzsi6jr1GlMY8Gj+nal3/yty+Cip1BzjYWME4EMIg3sVk5y4tm3lvc84utcpt4px+QHlg63HQGT1emksK6yvv0u+Jum325HllIFs60KpAS8ln9WOT0HMdkL7dLgGOZHAIXVMo/9eJDOlSn01QjRaGdBs/6O2LHPDhq3nstYqwSOph2+fbajuzhEuKW+8EqF5hoLndIatlVjdhcviQ2kTtN0/UxhmXa+DO0HZrSfEG1dqkWgzrJkAWxm/R6bWTCOzMbRp9pgh5F6eG6G9tnAIbYaeQ6Z5Cj9yutDQ2i7Nb/qQaxnpJUDd2wR6/g3JDq5gGvEYcmXcXhBOlKEzr185Jn1zDGyg4e8FnmPjUSlVhOZd9zgUpH9a2ghnc3yAgUPiShopIEDlMrchM/LmAw3EI9nIrZHsFpRb4ma7wP6Yw== 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:(13230001)(4636009)(366004)(66946007)(38100700002)(66556008)(66476007)(6666004)(6512007)(5660300002)(8676002)(8936002)(6506007)(52116002)(4326008)(38350700002)(2616005)(54906003)(186003)(26005)(508600001)(86362001)(2906002)(316002)(6486002)(1076003)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mYpEdBgd/txFPc85Eq2ViR+LpK1wMDCJ0TroqrXAYpZBIujOIWG8rT5CDJb/D20NE8Clf0NQub4lgyu8EJ+F7Q16ngNRuAFzGu7MV4Yc+iO/MUlcTQA8ixNu+cxdvNv+rRXt612iQ/v//Owk1UkSCYVmo+oAxjX+9ZZ8u473Ap+TTWoHDHkI+m/UdkYPZ8jyO4ZCcVG8knzEilO4alO5+MRoomM/34LjRcL+zkxYufgXvGE738lt33TMHCsHk1Lct+1fYDFPQoQQZiLqVgaY7O55eFcbDIGgFJnaT8dIOXWK/zi4OI6LFXyw5Ik4/UVwytlefl7YgXCvM716I3fqAfyEfFDbOov/ds/IReOH5egxu54+GvGW01VNe7f4Lh02jJGa2+jVeXA/ci5h4AlCN22afv1QwcfqP5j7RJYboTDNFOOyy+8bgazBj4aPsifU2gt2eO9ImWa2av06birIFUFsl8p1kQbvyA86nOqEOK55C0ecy5Nqn+/PxlFFA4T2ISucGi6G8z67rjiTnlrfvQlInWRSrRM1vCO246DYyHRH/ufK48pqM0UIMsgqV4O+/BE0eKeBAq22esVhAvJKFMSG4mC9vc7pSfV0CNHz5nChT0k83mLfPW7rYdPxS1uRovKhoBzrO+7U6sWLHFY0nc+hiofS9fwjTjyQuxDhRFYL3ocbl307uUThSDaBsyrCUjta6huhptolqdFfVeF/PLaEcG3DyQPACEYi6xQRiu+AnXJuNyOpG1smQV83LWdvuvwKWpzdiFSVBrZC0Mi0q13jOSZwQePZ0uDaYNd1TCnZ5BdDix94aKd9VlDT5+XcDOY8QQgfgAi7Do4CqQAGiuYZ+OcTmaRaavguyO19GK+aw3mgN/6lVg2i8HAHRcJtTjr3A35kmJdy/4HrbSWuK3TQqowYyBn5sJLVESryhQf0uIk3WiIRxe2YdVC5ldzMLDUymQhcpujgwjLEROzuq5FndSFxXXjdu0aS+okhkQQgxLvp4BYYURrC49QDy/3s3vyDVfIXaV407XOh22Nj9vmMYBh7QIm3TjbQ8ZsKoPFwci3YwEUBhcaw3O2xt9mjvKNwZL+KkhmU5xyXEVU6HlRYOFjuRodKbmG7P4gOxyXrSZvcrECec5oTNw7ObFxed0X+siFsr15IqbPfNuv4a0M3iS/3Cl/27fufEODVKf/l0qwIufIrcgjZ5qmGffPau8WXhd68oIp10it5bK5r991aqKvWytD4XgHS+0zFPIiJ46VER+Pa+wQUeKAvyaEN2lsB5UoNhPCLWxUmYamZ/on0vCih4bt4GpPDNcH8NVMfAYKX5K6X7V2EbAD9Sh6sxoEU2pjVrnw4b/sN4sv9zfBY1gVnCee1dOQHgkmsHf8kcyqpinY8cWRYS8ZBi60891TZRcu1M8KJl2d/tC6VUcpQ56STic+sDpDjmRufhNMeSNPSXSs9aHtK5n1Wll8ooqevX+Kyj5ie5xrnKJeWGlGKXn8jggnlRIFQgbdDtq1UeOhTkNv3H5TnH3O6r0sjRuPIYEJ6Gt69HIDtzJPeRS37nE//UueC7Y4zjisCguKuYXwmuB6hsBpd35TEr5iUGOMNRFvLj59jsUm5qrp14FezoMFIMt+7FoRIipiinxY= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9023b01a-1ab4-476b-9a36-08d9efb2d060 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 12:09:13.0719 (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: HYweKQVG0p1/7V6WPnYKXk+5hvoZukHhg6eSW28cw6V6j7HqouqK7ogixowtw0Vyi8GWIJTCYwqAG6Hf26vMzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7980 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.5 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: imx8ulp: misc update from downstream
|
expand
|
diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 7aa89aefe8..e40df1e290 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -26,6 +26,8 @@ #include <fuse.h> #include <thermal.h> #include <linux/iopoll.h> +#include <env.h> +#include <env_internal.h> DECLARE_GLOBAL_DATA_PTR; @@ -785,3 +787,37 @@ u32 spl_arch_boot_image_offset(u32 image_offset, u32 rom_bt_dev) return image_offset; } + +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) { +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH + case QSPI_BOOT: + env_loc = ENVL_SPI_FLASH; + break; +#endif +#ifdef 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; +}