From patchwork Fri May 31 10:09:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasileios Amoiridis X-Patchwork-Id: 1942094 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cern.ch header.i=@cern.ch header.a=rsa-sha256 header.s=selector1 header.b=nYnl37Zu; dkim=pass (1024-bit key) header.d=cern.ch header.i=@cern.ch header.a=rsa-sha256 header.s=selector1 header.b=nYnl37Zu; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VrNCx1ngYz20Wc for ; Fri, 31 May 2024 22:46:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C17798877C; Fri, 31 May 2024 14:46:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=cern.ch 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=cern.ch header.i=@cern.ch header.b="nYnl37Zu"; dkim=pass (1024-bit key) header.d=cern.ch header.i=@cern.ch header.b="nYnl37Zu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2373C885AF; Fri, 31 May 2024 12:09:31 +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=unavailable autolearn_force=no version=3.4.2 Received: from ZR1P278CU001.outbound.protection.outlook.com (mail-switzerlandnorthazlp170120005.outbound.protection.outlook.com [IPv6:2a01:111:f403:c213::5]) (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 20D6488607 for ; Fri, 31 May 2024 12:09:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=cern.ch Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=vasileios.amoiridis@cern.ch ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fiWJDArUbVV7eno/+8oYkQFG8QBlY+3cGzSAwB3ni0s2BLiLd00mTozzRddhQ4E0rJPyEJlsy1IYW94uvbjtq3IneHq4T6cd+257VVFBdg5ICKRv3a+0+EtnxK7HDHl5nLsExenUccHi2UJ49m003e/uLm5MWnYPN9IkPm31CFDt6QQNEYn4ZLEB/HEmsfrikGaEsHGnPNbLAALzzC+DW7I3rFZVt9BRkWai+DjJK9s1z3gKJYvZ6jH3AESgC+M5x8PxhtiNw/dB+Wa9492IDXkhbS950gSnsw+UbyiSoMy7UvMepVdRX56d7JjKR4jQgTmffMP53SGeV5K10C/Ygw== 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=btC4hyh/q0q4ag8Kbf9rEYoVr1190c720NnKb2PIh5Y=; b=FYndBV3rePAmAjv0LURwySU+7vkXqUnVb53nAd7Mh86ixysUfHoCPmlSMlMUQWvS2iqpqOH3/F2ZYSS8j68rLiO02GBD6VOP1dJmMw2+oFGunbMW9m+Vi+2ciYSsAZn7QGEeLZ+pNBGBQ9Se+CGgWN+dCtyXWTwh4++eqJbGNbVpLhYI1vj0Hq7Wypn70vY3i3w5rbRg170ezs1Zgl/xLAnM8UYQJ4L6IwjMzLjfny+7e5qDLQWD66Ibgpl5UvE1i35ZWS67pG6xKrNWS08sgBpiniqzNsNIhyOmqZY4uRDBgcs7T4gJUGBJFztxBzL4jhqX/k/wQGNdRdco3qFkKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 20.208.138.155) smtp.rcpttodomain=amd.com smtp.mailfrom=cern.ch; dmarc=pass (p=none sp=none pct=100) action=none header.from=cern.ch; dkim=pass (signature was verified) header.d=cern.ch; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cern.ch; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=btC4hyh/q0q4ag8Kbf9rEYoVr1190c720NnKb2PIh5Y=; b=nYnl37Zu+lQ2sU6ILw9Gdad0E2dlY3u9ID4YLrqN3UwyEknRhO3peANMGi6Qlw2ogtJBknLmnA9K9zwl04DY2nEc6xEbIbRXxy5Y9QEpRsofuwJTKgZU6aPHDV438fvGVk0+Gw83T147dTuBOsWehlsH36nMcWH1+mP4jHV3R+I= Received: from DUZPR01CA0133.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bc::28) by GV0P278MB0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:710:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.24; Fri, 31 May 2024 10:09:26 +0000 Received: from DB5PEPF00014B9C.eurprd02.prod.outlook.com (2603:10a6:10:4bc:cafe::e4) by DUZPR01CA0133.outlook.office365.com (2603:10a6:10:4bc::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.23 via Frontend Transport; Fri, 31 May 2024 10:09:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.208.138.155) smtp.mailfrom=cern.ch; dkim=pass (signature was verified) header.d=cern.ch;dmarc=pass action=none header.from=cern.ch; Received-SPF: Pass (protection.outlook.com: domain of cern.ch designates 20.208.138.155 as permitted sender) receiver=protection.outlook.com; client-ip=20.208.138.155; helo=mx3.crn.activeguard.cloud; pr=C Received: from mx3.crn.activeguard.cloud (20.208.138.155) by DB5PEPF00014B9C.mail.protection.outlook.com (10.167.8.170) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.7633.15 via Frontend Transport; Fri, 31 May 2024 10:09:25 +0000 Received: from xguard (ag_core.activeguard.xor [172.18.0.5]) by mx3.crn.activeguard.cloud (Postfix) with ESMTP id 9023E7E526; Fri, 31 May 2024 12:09:25 +0200 (CEST) Received: from ZRZP278CU001.outbound.protection.outlook.com (mail-switzerlandnorthazlp17011007.outbound.protection.outlook.com [40.93.85.7]) by mx3.crn.activeguard.cloud (Postfix) with ESMTPS id 4B3797ECBE; Fri, 31 May 2024 12:09:24 +0200 (CEST) Authentication-Results-Original: auth.opendkim.xorlab.com; dkim=pass (1024-bit key; unprotected) header.d=cern.ch header.i=@cern.ch header.a=rsa-sha256 header.s=selector1 header.b=nYnl37Zu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cern.ch; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=btC4hyh/q0q4ag8Kbf9rEYoVr1190c720NnKb2PIh5Y=; b=nYnl37Zu+lQ2sU6ILw9Gdad0E2dlY3u9ID4YLrqN3UwyEknRhO3peANMGi6Qlw2ogtJBknLmnA9K9zwl04DY2nEc6xEbIbRXxy5Y9QEpRsofuwJTKgZU6aPHDV438fvGVk0+Gw83T147dTuBOsWehlsH36nMcWH1+mP4jHV3R+I= Received: from ZR2P278MB1164.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:5f::9) by GV0P278MB1540.CHEP278.PROD.OUTLOOK.COM (2603:10a6:710:65::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.23; Fri, 31 May 2024 10:09:22 +0000 Received: from ZR2P278MB1164.CHEP278.PROD.OUTLOOK.COM ([fe80::b971:7e0c:3b2d:cc67]) by ZR2P278MB1164.CHEP278.PROD.OUTLOOK.COM ([fe80::b971:7e0c:3b2d:cc67%3]) with mapi id 15.20.7633.018; Fri, 31 May 2024 10:09:22 +0000 From: Vasileios Amoiridis To: "michal.simek@amd.com" , "trini@konsulko.com" CC: "santoshsagar.algapally@amd.com" , "vassilisamir@gmail.com" , "ashok.reddy.soma@amd.com" , "LPolak@arri.de" , "venkatesh.abbarapu@amd.com" , Vasileios Amoiridis , "u-boot@lists.denx.de" , "sr@denx.de" Subject: [PATCH] xilinx: Add option to load environment from outside of boot media Thread-Topic: [PATCH] xilinx: Add option to load environment from outside of boot media Thread-Index: AQHas0Kbt0GMDUrz7E+NyZKWbHYPuQ== Date: Fri, 31 May 2024 10:09:22 +0000 Message-ID: <976d57fe9080e9068421bec882ade85faaa3e30f.camel@cern.ch> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.44.4-0ubuntu2 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=cern.ch; x-ms-traffictypediagnostic: ZR2P278MB1164:EE_|GV0P278MB1540:EE_|DB5PEPF00014B9C:EE_|GV0P278MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 15db8cee-21ae-4ed4-2126-08dc8159c06f x-ld-processed: c80d3499-4a40-4a8c-986e-abce017d6b19,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info-Original: =?utf-8?q?Ko1lzJxv3gQVjU8KiDTewU?= =?utf-8?q?xSN0AIS9Jm63tH+aFNwoOxQLUdfoL/ZgmzULTy5XQs9YjbGGjhFfw0cfMvupEky1X?= =?utf-8?q?FDRWLN/j1HD3p1Zu3ASw8JfYlqLKufW8adqG0/AFwj+o5lbLnbw338N3Ur0cJooSa?= =?utf-8?q?1a5nSiL8h0sxiuXSCDiBvHqf0JTVUgxC9OTSsBeKlU8Hc1ltfRvrf0CCqTN2UMVOP?= =?utf-8?q?+1DI4i4Y76YhlwXbeP7gSm/sXDkyPlllflgnZOjHSuLyEOWMjL+ht12ZxR5lTFrew?= =?utf-8?q?L5357Y2vgWRQa5f8BTzHDS+ioab4OvxzHJ8Wss5LLwliHFfPN8GWSfLUZVMUYGiKd?= =?utf-8?q?VMiwhggcdWnMd4K8AbK0WEW+Tl6m9iEcSwZBzubF/I6DbtUMR9kwvx9Gj4a/YpU/M?= =?utf-8?q?SqOXLS8Gdd8GLLUEHtEVEKZV5CfkEWRdY6OebFL4yGe76sS5YAWuoStiEjwc1PLL5?= =?utf-8?q?M4H4tdYDFeqsi5DuAWqj/3Q6HT6UDKPVq1g2NCRmth/78N/NZVvUReGWba7yTZdgy?= =?utf-8?q?K/9qkLinHW1BgiMn7uuFg21PzB6zCUbY7bl3lF//cRH0cxJSS+MzETYiXqkKP+MTA?= =?utf-8?q?MCr4jxC/wMlTnkh957QMgLGomCgZAu9PFE5aTOIF5Xb1XGsUHYaCYSIZyWzuovWlD?= =?utf-8?q?Ei4nfpAX3UBXJw+5x46nQzPwfdpKMBXUydJSn/fEH4OX45yV5bZexF64jdsbll7Tc?= =?utf-8?q?MQw7xaibsfJGqYxTEztFsqcv1YqRezVuoA3gO4c5nPEtx0ARj2X7EP903tf4XgRRg?= =?utf-8?q?WYZyhC/MlfibiWpGyN6z8IJC+Qx66E84YYkDFxyn9WKD5cIv6tJLriEArjkqhkObk?= =?utf-8?q?zS5gjIQXO+18k68RL9RXJ/kcozILHOeRPVcqUeVlv+YR0rntznFLJLN4JfEwJrubW?= =?utf-8?q?41egDcopAVSMHqiyJN8/4wcFUIC4EShAJk7GjX9j8r/m1nW4ku7MzQDWETF6in3DZ?= =?utf-8?q?UlvaU2/onYkW5lSTEtv8U8jS7BL8rHWhBP0oFKKVEPLqkn9l7rtnn6zGh7ACmm0fP?= =?utf-8?q?Lq1PEB9UBaSK3d8SstD0zinKO57JPA9NnSown/m84Egz9V2wdkP0tCIwlOto3U6T0?= =?utf-8?q?401c4XANPiYdbBA1m6OHvjRSDXRA46D23Puv7JzkMXnYNqTRK12kg/u/pe8u6NITp?= =?utf-8?q?6BC7qy41r7EatatSqegdSM6CNyf2uO6I0iAsR6BMkoriFtdTS/j2cA0SBdWBLK9bQ?= =?utf-8?q?ZP0Vvj5rIxCq2ONw0By30xbhYeVTDNna6H/xeaZLB6r6O84Vt9TI0myOU+86Sf2Fm?= =?utf-8?q?K5Gkm/uVIMMjkPPXBatAjpIIAFek1BjNDPDHHoO8I8dg=3D=3D?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB1540 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5PEPF00014B9C.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c59dc93-d2e9-428e-c82d-08dc8159be1d X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|82310400017|376005|35042699013|1800799015; X-Microsoft-Antispam-Message-Info: =?utf-8?q?sWcpcLG5T0fEisUUQP1BxM7WGVnQl0O?= =?utf-8?q?QKt76Z9bC1/8YmUR/ch9jbNrxBWClFaAQOPA/+wtCEwzaUoOqUjqprxJSHhOhjJZX?= =?utf-8?q?3gi4zJlp832NEobA3SX1hFC4h42Pv0jqfiBtLoiD9wfH/nw1l5SvaN/DXvzpg8ANw?= =?utf-8?q?adXkN93cbpe3LK37+jTDPtEiM4e+VjAfFMcFCRU/kj7aSBcduhQcVLTycWcMTNlez?= =?utf-8?q?DzxED/vIhB13JwSt02MhUutY9CBSa+hqzfsiaLlX+fGtBo24kzo432UNFJ5yzV73y?= =?utf-8?q?9Jl3K7dEfuHaeq1KA871z/5nT6ZaocQ/DPUzSpP2FpOdMEMgeDGtCT2ySTp4l9EgR?= =?utf-8?q?/12YjBgqf/HUSk0RlcpiqgcBYbxUcQhzdIkciuVGOaIJAz/9A55mDPQmMWgAJMLd4?= =?utf-8?q?GyPbNK/wLBLcqCFHr9BY3arD0yhGIasfml55s60oLdCFBUsj+3N80PoOsUBfOHA2q?= =?utf-8?q?rr3mgi+k0kbvucAjEQ89yxwM8TZLMYu9eRqypOnuWMwCOQ0ykhYUGebpdWKs3LNOW?= =?utf-8?q?J1KmEhw2Y1xdVS/l8+Ly/glYCNyjGCPJxkeKjsOVgGOGPD9mHVRFeyERLUZz6SeBR?= =?utf-8?q?odQlBFcGnZxlg0BHC07A1QrMq5VibrwDGJv8e5Q5YosF0SK4+DVhxpyzbNDPTyUz3?= =?utf-8?q?aH1ZSks6udohxdK7I62Yn66C8Nc4Nm6Z8287coG0cLI67cVYwyCvldyGRjh2tkprx?= =?utf-8?q?Yl30r9AxTuNCXGi8c+UN2ubObMV7onQ+1h+hot1M+g69RBBb64HjBYw3l1cA6aV0A?= =?utf-8?q?wQSoorN73N29VgY2r0tb6nDd7WbHHt6oSzfHmGfFoumjU6m1c3eBpuh+zB6oY5bkH?= =?utf-8?q?B713+Pi+e6hXVT5FH+eU8+dI91PgueIDQ8XsdzAtgZ1ZeRJW9NeKmOP7UmVLag6+h?= =?utf-8?q?LkhmyfpM7cwEJrAcS1KNTJ9DlL31bkFa2iw0ern227W7Ib66fssOEmjA15O6FWaf5?= =?utf-8?q?Wo/JvAiNOE1dpV9GfJJBiQdqTmW1AO5nVrrTYxtD+B3Fo0mG0DlWzfSJ4at6YRPSe?= =?utf-8?q?DBaPews2vMQxwVI/5IBLdcqiZ0RPbrHAEz/xVi8cpdZeGjB2xiszxGg13X0EpZ0Vt?= =?utf-8?q?HPHmU6iALEqOdL/yp/N3gC46CwXpSSkfB46ZgWPjck+jKBQwdtnyQvXm0yntFZ5EA?= =?utf-8?q?Wl+CJ2xdBL422g9hW3i3Nnjgwmzo2Xkr2Pjj6hg4q42vcxaEnnaVDZzkTnUt8NDon?= =?utf-8?q?1FjZ56YIK+RQqN0mm4l0w39YAVYS3OyZJASHM5QXkhIXwwAFiVo4BflveKAzWe35L?= =?utf-8?q?IyUW29cmG0rtHxNST+YkBdU075WTELZFaREdKY0AQE2Q0r6jg+ARXqg1Ouu0u4xRY?= =?utf-8?q?u0/ZHykeOPRk?= X-Forefront-Antispam-Report: CIP:20.208.138.155; CTRY:CH; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:mx3.crn.activeguard.cloud; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230031)(36860700004)(82310400017)(376005)(35042699013)(1800799015); DIR:OUT; SFP:1102; X-OriginatorOrg: cern.ch X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 10:09:25.9411 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 15db8cee-21ae-4ed4-2126-08dc8159c06f X-MS-Exchange-CrossTenant-Id: c80d3499-4a40-4a8c-986e-abce017d6b19 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c80d3499-4a40-4a8c-986e-abce017d6b19; Ip=[20.208.138.155]; Helo=[mx3.crn.activeguard.cloud] X-MS-Exchange-CrossTenant-AuthSource: DB5PEPF00014B9C.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB0002 X-Mailman-Approved-At: Fri, 31 May 2024 14:46:11 +0200 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.8 at phobos.denx.de X-Virus-Status: Clean Currently, if the environment is not in the current boot media, the env_get_location() is returning ENVL_UNKNOWN or ENVL_NOWHERE which is not true (i.e booting from FLASH with environment in eMMC). This commit adds an extra check to find the environment in the other supported boot media, keeping the same priority as of now. Signed-off-by: Vasileios Amoiridis --- board/xilinx/versal-net/board.c | 47 ++++++++++++++-------------- board/xilinx/versal/board.c | 47 ++++++++++++++-------------- board/xilinx/zynq/board.c | 49 +++++++++++++++-------------- board/xilinx/zynqmp/zynqmp.c | 55 +++++++++++++++++---------------- 4 files changed, 101 insertions(+), 97 deletions(-) base-commit: a7f0154c412859323396111dd0c09dbafbc153cb diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index da03024e16..5295221aaa 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -377,29 +377,30 @@ enum env_location env_get_location(enum env_operation op, int prio) { u8 bootmode = versal_net_get_bootmode(); - if (prio) - return ENVL_UNKNOWN; - - switch (bootmode) { - case EMMC_MODE: - case SD_MODE: - case SD1_LSHFT_MODE: - case SD_MODE1: - if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) - return ENVL_FAT; - if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) - return ENVL_EXT4; - return ENVL_NOWHERE; - case OSPI_MODE: - case QSPI_MODE_24BIT: - case QSPI_MODE_32BIT: - if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) - return ENVL_SPI_FLASH; - return ENVL_NOWHERE; - case JTAG_MODE: - case SELECTMAP_MODE: - default: - return ENVL_NOWHERE; + if (!prio) { + switch (bootmode) { + case EMMC_MODE: + case SD_MODE: + case SD1_LSHFT_MODE: + case SD_MODE1: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + break; + case OSPI_MODE: + case QSPI_MODE_24BIT: + case QSPI_MODE_32BIT: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + break; + case JTAG_MODE: + case SELECTMAP_MODE: + default: + return ENVL_NOWHERE; + } } + + return arch_env_get_location(op, prio); } #endif diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 4f6d56119d..4201c3e2ef 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -296,29 +296,30 @@ enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = versal_get_bootmode(); - if (prio) - return ENVL_UNKNOWN; - - switch (bootmode) { - case EMMC_MODE: - case SD_MODE: - case SD1_LSHFT_MODE: - case SD_MODE1: - if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) - return ENVL_FAT; - if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) - return ENVL_EXT4; - return ENVL_NOWHERE; - case OSPI_MODE: - case QSPI_MODE_24BIT: - case QSPI_MODE_32BIT: - if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) - return ENVL_SPI_FLASH; - return ENVL_NOWHERE; - case JTAG_MODE: - case SELECTMAP_MODE: - default: - return ENVL_NOWHERE; + if (!prio) { + switch (bootmode) { + case EMMC_MODE: + case SD_MODE: + case SD1_LSHFT_MODE: + case SD_MODE1: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + break; + case OSPI_MODE: + case QSPI_MODE_24BIT: + case QSPI_MODE_32BIT: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + break; + case JTAG_MODE: + case SELECTMAP_MODE: + default: + return ENVL_NOWHERE; + } } + + return arch_env_get_location(op, prio); } #endif diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 6c36591001..4c9923de18 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -138,31 +138,32 @@ enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = zynq_slcr_get_boot_mode() & ZYNQ_BM_MASK; - if (prio) - return ENVL_UNKNOWN; - - switch (bootmode) { - case ZYNQ_BM_SD: - if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) - return ENVL_FAT; - if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) - return ENVL_EXT4; - return ENVL_NOWHERE; - case ZYNQ_BM_NAND: - if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) - return ENVL_NAND; - if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) - return ENVL_UBI; - return ENVL_NOWHERE; - case ZYNQ_BM_NOR: - case ZYNQ_BM_QSPI: - if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) - return ENVL_SPI_FLASH; - return ENVL_NOWHERE; - case ZYNQ_BM_JTAG: - default: - return ENVL_NOWHERE; + if (!prio) { + switch (bootmode) { + case ZYNQ_BM_SD: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + break; + case ZYNQ_BM_NAND: + if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) + return ENVL_NAND; + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) + return ENVL_UBI; + break; + case ZYNQ_BM_NOR: + case ZYNQ_BM_QSPI: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + break; + case ZYNQ_BM_JTAG: + default: + return ENVL_NOWHERE; + } } + + return arch_env_get_location(op, prio); } #if defined(CONFIG_SET_DFU_ALT_INFO) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index f370fb7347..b610668d28 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -593,34 +593,35 @@ enum env_location env_get_location(enum env_operation op, int prio) { u32 bootmode = zynqmp_get_bootmode(); - if (prio) - return ENVL_UNKNOWN; - - switch (bootmode) { - case EMMC_MODE: - case SD_MODE: - case SD1_LSHFT_MODE: - case SD_MODE1: - if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) - return ENVL_FAT; - if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) - return ENVL_EXT4; - return ENVL_NOWHERE; - case NAND_MODE: - if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) - return ENVL_NAND; - if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) - return ENVL_UBI; - return ENVL_NOWHERE; - case QSPI_MODE_24BIT: - case QSPI_MODE_32BIT: - if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) - return ENVL_SPI_FLASH; - return ENVL_NOWHERE; - case JTAG_MODE: - default: - return ENVL_NOWHERE; + if (!prio) { + switch (bootmode) { + case EMMC_MODE: + case SD_MODE: + case SD1_LSHFT_MODE: + case SD_MODE1: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + break; + case NAND_MODE: + if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) + return ENVL_NAND; + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) + return ENVL_UBI; + break; + case QSPI_MODE_24BIT: + case QSPI_MODE_32BIT: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + break; + case JTAG_MODE: + default: + return ENVL_NOWHERE; + } } + + return arch_env_get_location(op, prio); } #endif