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 6CF91C433F5 for ; Wed, 6 Apr 2022 05:56:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5B9583E0A; Wed, 6 Apr 2022 07:51:53 +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="dyt05yAI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0696583DA2; Wed, 6 Apr 2022 07:51:04 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::612]) (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 AB07883D47 for ; Wed, 6 Apr 2022 07:50:34 +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=OKjtzEpdBieH4mdHfQgpL0kDR8eJlyvfsAwEoO4RbM6bAdeHQ62KmceXejtgkHdht9NwinRwc5UjBmL7GSelpDvMTFD2/O0wXg4Vr2PDiS9d8grUZhRC4akpzyv9QddKEKRm67kWuBWNun4+fMzE7BmNnWmVr3vWXRYV/U9xuQ5+2b/q+WCEd9IjUnUuuTY/eGf+kPPEkS239CTm333QQWxnQo/IfF6WYLH1yqqNNBip4eugB9ccgMOZ0q18t7FQE142VinVti/9F669WGRSvaooW+1KXtoeX+iGQYYIwRrGE3UmEDCTjC7AFHH8el5mT3mvJpfyAXNS+9JxbSS3Ew== 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=vGqYDa2PLgfeFUJOMc+WSltGzbIX99rD0KjdysHZhv4=; b=hPQhRhjcZO3poJo1O4uGbplMG0c8RY/Y5cQHwyJIipITWIM043bOFU6eIEI/OxMkpj1ASLglzI7rG7F1nUQw24MJvZwMK9Rt4cEJ+sEmZc91TSCR40Ng1EmGui9oLy+oX1BXYj/mLrr5Aosl6Payzf/WRIPzU3yJJXPoT2Vzg+TdeNjt6I+4gQ9iVLQ3yJkWR1gx43LPTFptE63n+Vg819dUlzBhhUwy1aQlUH3P1JkEOwsXoJlRSrbvMQR8pAvpvTxRFSPSahCGRtf6PmNAwthgjjA4nPjFC+2uB/Tf9Ks1k4eyvfSJKzjVTrQj8kXtnKqfD4JUjpPONkAKT+KdVw== 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=vGqYDa2PLgfeFUJOMc+WSltGzbIX99rD0KjdysHZhv4=; b=dyt05yAIjoRlOaN7dfUEnxuNC8kqq8BCl6IgkIhokJsLFXvb4VL7kx4WCfw542WL9N6mTbPNcfkVKgmPTst3V6zQrGK5xybEkIPPU3jRLz6kGTb1MXCrLHL6/630VJxcz3JGUUKcF4Gf3IWny5nHt62x2le8dUEbU2T3xNzl7Dk= 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 PAXPR04MB9423.eurprd04.prod.outlook.com (2603:10a6:102:2b3::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Wed, 6 Apr 2022 05:50:33 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6%7]) with mapi id 15.20.5123.031; Wed, 6 Apr 2022 05:50:33 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de Cc: festevam@gmail.com, u-boot@lists.denx.de, uboot-imx@nxp.com, Ye Li Subject: [PATCH V2 25/26] imx: imx8ulp_evk: Enable multiple env storage devices Date: Wed, 6 Apr 2022 14:30:30 +0800 Message-Id: <20220406063031.21960-26-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406063031.21960-1-peng.fan@oss.nxp.com> References: <20220406063031.21960-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR04CA0153.apcprd04.prod.outlook.com (2603:1096:4::15) 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: 02487406-297e-4f7b-b161-08da17915d5e X-MS-TrafficTypeDiagnostic: PAXPR04MB9423:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True 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: qsJbUeExZBLy30OMgKW0aiLKYL7ARaCv0IEan9EcF23ZK9Dry6hGe0EH+5XmSMhk6nOiu+QuCWVjFStr1T49B0a39s1q8KG5cF+3nmO5ebA9BA1aVJN1fauxLTS+QfFBeQAML9M9GY8QtIg0vLyeaQAczqoRQ+Wj26pWLvuOfdoI9ZUua8VGLSOQlzczNvf+D6/3wzUBODGTRJMCfAnd5n3E3EyWvAlnj1uw2PZgj5VPqgnnm3HnpEkGh4X6aqVsqKoIjHB6cMnLfmnzYSZYDOhP43qgqCqZRHTzcX5jcwUOV/VmuGBXXN1Q7qdcboYuYa9InAVfJ8gEvLSZbbmdmXpgQzkVie876NOQtN2INtHtxFlykq5RBs9j/RLuQV6/A/olrr+DsyVPCoagiKt24jGAV+jBpIizDrfpWntiNMVlSLO6jndnnvm73Lfm4TJthPdGM6kd2tcMqylOcBf1D7ottIxSAoET76tOxWSqabzP2/Ux6eB36kUX+rbGAwFd8cOjIukZxDMBRS6S5njojz9zPYfIt5gz+wK9kOtZJCSz4op+RIVsEQ6oPU3HVJr0w9LENETwUKSTthEDGq8pTxKrTDJd9qZKrvG6i/empR8F6puYVWJAAi3MwtAUvW8KBlNKThKEh0P826oiA+J8cn3UtRTLh2ngoyPyFAsgAt6gmgif5XrltJXUYXtsFeCIPuZ3KdbKiZND2ZXQY+ZEKA== 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)(1076003)(66946007)(5660300002)(26005)(2616005)(186003)(8936002)(38350700002)(38100700002)(66556008)(66476007)(4326008)(86362001)(8676002)(2906002)(52116002)(6916009)(508600001)(316002)(6486002)(6512007)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3DWRYFtdCsrwEbub9woF4fIMOZgoPBgKnqFbZIFE442krXm5QVrNJ2P+mTa4?= =?us-ascii?Q?kyHixD5ohjZE9gWiQAphrjyiNO9ECnMpBW1mMfbfVjF1GH9PPInKxBUHMcNL?= =?us-ascii?Q?jusF4m9PiRf3D0AcKolpAeRfg+gx6KQrXHG4L3u4tMxG4BWudZn9SKGWI1BP?= =?us-ascii?Q?9UYtjQSZ/GPjjnZAvppI6OP/3SvAbdR1nE/cDGh4D9mBn2ZxQfO5op0Mbz9O?= =?us-ascii?Q?ayteMyEa581/kI0lLWK6eTsoQHQ8IWV+VeYGvOc2IeUtw+t4ytEyN8eBk8Hp?= =?us-ascii?Q?d3vE9w7JFs+z3KMK3FTrejH3IkA3eIYF8BF9kNCID0t/rZX9NXIhUYZiguF6?= =?us-ascii?Q?A/Jy6jFriX+vcrU+sfTDN6g07Ekt1MVCbiqeNWsvL46CiFgh9JD17mj+XkMG?= =?us-ascii?Q?si4i59pWNDSVlnMNReJ7IjPjz40kLj8jEelLoHQyo7xRpbVcP8Pzo6yigV5B?= =?us-ascii?Q?e5AHQ10VEFmwOC3M9SP8Ro5ayznPbYWPLL6X/3l6BFDxF9jyox6psjYpzjmw?= =?us-ascii?Q?W706m7zevvrAkvg0OvMdVFVDZggY4bxl9HzCjHQtZ68jDCWAODpHTbw6yp7X?= =?us-ascii?Q?HUOU4QkgSBFrl1qS9NjIlM3SGs/q0/QCZLAFcuy8QX1+1R7uywZKUglFwKhJ?= =?us-ascii?Q?ByyC4k9agQZ3frYU+WnJBeFZsy+wO/omVbvYzk772faYZpsNyc19fcGztjzj?= =?us-ascii?Q?5BbU3OfiSilmIZyXIa0yR1ax97NqUNnm+oUfcLeCGRvnn0DdB35WHHGnyW65?= =?us-ascii?Q?glRgyFaJVGGW8orGvh6XBx4W88KQT9zwvvzhgg+TaiZm9GvdpBBMSLF8U0IS?= =?us-ascii?Q?V8ytQQzKapSJAjpiGPTpvLjwrQaCpMuEV9HZvsdxtI1z+YFIQXWb378IZHmu?= =?us-ascii?Q?AHYfJ2wb3mKRI6KN8WCxsuGMJP17QkiI6f+WBpLqVNVTudYIFIwu7Gp4SjU4?= =?us-ascii?Q?eYDEB0ookw1gSehP10sLds/bXAdp49hBPrDwxytXp70qW55gxgSeKesVnxEl?= =?us-ascii?Q?2ovfxGnQQHE5z8DBIqwJbBvWJQRz5c8DcuXqFIIUQp/lMaNqOM/KcDYkgjJH?= =?us-ascii?Q?Wk+XcmJNOqq9u1GWkb3dExzklHmF+HYRp7/aiOI4WyjIzPV6HO6FfmQIWN22?= =?us-ascii?Q?VPVPSPHHAOW59uLZQ+AM3aYWoiQNyTtul77EITE5890CWIx2xQevXoUSPfz7?= =?us-ascii?Q?NA8Adce1xoUJYN3zFRwUvlMoVYvOimI1iJ8dBwNqlc6FXlFu7JoT+eYpTuvz?= =?us-ascii?Q?yaUQsmFGDKI9mfS6PfDGy39Q5INKPrQUh9tPRa/qhY5qozldiWtjvqclRyZD?= =?us-ascii?Q?THdsrAkkUdjyQGF7zNzrJaxLcHOqzJgfAb4e8tvWR7vk7BMdT8yy1iwsZfe5?= =?us-ascii?Q?D1Tk3KbjMwU0Si+eONsbOxW4R9wTFEFSRb88xapwQRd8tS5YvnU7y8Wjg/pA?= =?us-ascii?Q?OnDquujB9cSpDpRw7Z8bEVvkvxWB5+oH02ZMKhMKizIOiJiNEpjh47KEfpJF?= =?us-ascii?Q?XE+sAg5Vj+MZRWn6PT71GZqC+svLfnJcsAdFhECSHr4cBvzkzUsmy6beDo6f?= =?us-ascii?Q?rmpB6h8nb7J/OJUMA4xJLdC1iaz75A0UWgoxlgZmka9alnqKvWpDj822Pscv?= =?us-ascii?Q?tnjoFlbfE39e3RCpep/QQO61E9nxbnPZpzW+LUwooISfmS2aQIR/bbfBDWPl?= =?us-ascii?Q?M7QlTczUL7K0cLixxdM1mY6+tlosZFh5WcjTMtsFqC9KbTjnYDV3on1ZpdwC?= =?us-ascii?Q?h3yKcFHINA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02487406-297e-4f7b-b161-08da17915d5e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2022 05:50:33.2092 (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: u3wn9z8KMwB78+zIYOTvLXH0v6iEKK9kruDfWJrIBu6djskqIbxeGqP2RR57pebVVwkQ0ny648r7Y9eCADpvZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9423 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 From: Ye Li Enable multiple storages for u-boot env: MMC or SPI flash or NOWHERE for usb so u-boot can runtime select the storage flash according to boot device. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx8ulp/soc.c | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 25b4fbd294e..35020c9714d 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -787,3 +789,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; +} -- 2.35.1