From patchwork Fri Nov 26 17:43:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1560278 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Zcse34cN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4J12PG6flrz9s5P for ; Sat, 27 Nov 2021 04:51:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE46F83736; Fri, 26 Nov 2021 18:51:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="Zcse34cN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 77F1483681; Fri, 26 Nov 2021 18:43:45 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 25AF383681 for ; Fri, 26 Nov 2021 18:43:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tomm.merciai@gmail.com Received: by mail-ed1-x534.google.com with SMTP id l25so41602573eda.11 for ; Fri, 26 Nov 2021 09:43:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jwqyKZUxYX6afOIXCJONmhmrjd3o/zXgd4G1nwRzXMU=; b=Zcse34cNeif54TX8oQeURA+o7g84pVOD8NepAU5MzrgWvGAGRisjdHeYnRTIZBabFu 2WL/0Om+ZbLSy6vuAs9uYbkSgXrRfx1Ywqo1SkyxVs3B51diZ5BPMPUmq/J1+635aD41 YGZjm7tf51VWOdKlyHB71S5Y9OPmR/evJjKeASb0TLsPlId20T3UIhNIvmaVHFk1++/x rn1a4m+0Dgqr5wuqfy9fPRdx3JgWlMx0jdB1Fn1Mgbx+cxZafUt/dYMjQ5SC7goIY//B mfOMIOgFm5MQ+vAOlWsGv0+t+U8Fxs/sxmVFq3JnQff1Fws+wR1Tdk5R/Vcq3BfiwHCm gZoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jwqyKZUxYX6afOIXCJONmhmrjd3o/zXgd4G1nwRzXMU=; b=RrMejueeA1Mc5f4a5BwQtGDI7P6l5ACWvqv+tZVQcBz/VzqFNYDlkAeSpfO+sW194y QDg/ePM5N0hcniDzAr9uMb+Bfcv/zGPZjV5zlmNoa1Dzt4/xvrAoEHFzSZBHmJkVEW+a 2MC+3qZ9LkqC5f0r5qCpG4xNXy1Fv/BrxR152092T2p/OAPD4br4hPiU15HSK1RF+3jp 9UsYrZzRO4UH90Y8HJoVBJaG18dhGYmr57VZzd+ZterAqclLUrIExUG8Q/KTqDi+awmz mRfNR2H+t6dJIPApvz51NSsQkBZYb0wDJHTAGdNKvon1qxarXVXuoz6F4sRqwm64WvjM aJLg== X-Gm-Message-State: AOAM5304UoswjzeLAz1rCftz1U14y0RMohizWP6hg6+HAnpjoZglAdfD khbSGODaU92iq9GWNzyjxjE= X-Google-Smtp-Source: ABdhPJyHpBnAs63hOCKwuIG8HgBOB8RxwZ0fWwX3pSjcV7ZQor5FbMiK+EevHeU3JRPJTshKGHqRZQ== X-Received: by 2002:a05:6402:41a:: with SMTP id q26mr50619328edv.387.1637948621847; Fri, 26 Nov 2021 09:43:41 -0800 (PST) Received: from tom-desktop.station (net-2-39-74-150.cust.vodafonedsl.it. [2.39.74.150]) by smtp.gmail.com with ESMTPSA id sd28sm3841946ejc.37.2021.11.26.09.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 09:43:41 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, andrey.zhizhikin@leica-geosystems.com, Tommaso Merciai , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , Ye Li , Simon Glass , Marek Vasut , Frieder Schrempf , Harald Seiler , Tim Harvey , "Ying-Chun Liu (PaulLiu)" , u-boot@lists.denx.de Subject: [RFC PATCH 1/3] imx8m: drop env_get_location for imx8mn and imx8mp Date: Fri, 26 Nov 2021 18:43:29 +0100 Message-Id: <20211126174331.5928-2-tomm.merciai@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126174331.5928-1-tomm.merciai@gmail.com> References: <20211126174331.5928-1-tomm.merciai@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 26 Nov 2021 18:51:30 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.2 at phobos.denx.de X-Virus-Status: Clean This function defined for two architecture is not really generic and can generate problem when people add a new board. Signed-off-by: Tommaso Merciai --- Changes since v1: - Fix commit: drop down only env_get_location arch/arm/mach-imx/imx8m/soc.c | 39 ----------------------------------- 1 file changed, 39 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 863508776d..f0030a557a 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1313,45 +1313,6 @@ void do_error(struct pt_regs *pt_regs, unsigned int esr) #endif #if defined(CONFIG_IMX8MN) || defined(CONFIG_IMX8MP) -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_NAND - case NAND_BOOT: - env_loc = ENVL_NAND; - 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; -} - #ifndef ENV_IS_EMBEDDED long long env_get_offset(long long defautl_offset) { From patchwork Fri Nov 26 17:43:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1560279 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Vi9n9IH5; 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=) 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 4J12PR5FRCz9s5P for ; Sat, 27 Nov 2021 04:51:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 217B983758; Fri, 26 Nov 2021 18:51:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="Vi9n9IH5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 25C4C83681; Fri, 26 Nov 2021 18:43:48 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 889D5830A7 for ; Fri, 26 Nov 2021 18:43:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tomm.merciai@gmail.com Received: by mail-ed1-x536.google.com with SMTP id x6so41728244edr.5 for ; Fri, 26 Nov 2021 09:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KBkNpJuX5I3RwgNy+c339qh+aEgNZTf2WuSVxqjdH1g=; b=Vi9n9IH5qdT4ZziU4ULN7rx0ckgP/DiDe7/0H9yJNIItIo3TQEgHfU7QUgik/ImjPF njYKGm7Y/doPRFwdFB8mPEcjra09SYZkdt9E3QswzB1SnDVRs16eH7R9vbK9yECo8SQJ HP7t9tKm174am+eE5G3VyY7y8YoMXO27VwIzD026cBmGCBhQOmorW5PsqviJSyooxHLJ si8iuZGNHqXuh7PQOGQS5Ou1FmLGA41af2uz4i6EeSFhUa7Glo2dV/5eLjNESiq7NYl3 8X247DE7DkvhsoKolTfcMQBgdMJaO5sQV5lxYSpR8SKMvoAynZ5hftKpoYBLMrubGFJA Edpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KBkNpJuX5I3RwgNy+c339qh+aEgNZTf2WuSVxqjdH1g=; b=lwjze6jlVBw+IWUEMOitHuC7AztjBTEGbT3I9MGmEdF4RNpKj9SyUkZqp/DEJaO00t TctZbdHtijEgYFm1tz/TyC6uyYApUjNIi7GdfHw2bZD9DNJmAr/R8Bo8S4Ok6BkGSYRe p73IsLud5lJd0A2myekJz+2vYSrnvfhNm+cSodi91Xsz1jPAiLh1GvfQ0ARlF15Z10xg qgmVM3yVBwkrfVRp/j7AFl3iX/YSVbj8SoUWROllmzFw68iT0ETdUoQIZGicViQw5bQ7 WRAwy9sRJBGWOJa/5LpuGvE+h4dK+JyhDFItV3b8gfBn3Np5NO0k2EEwXO/nP9Bd2VW3 3UoQ== X-Gm-Message-State: AOAM532Jp0RjiUOmRaq60qlTOXYa7VBCKiiuhEdUaH8VkfVOfIEAnM3+ mOgqjDuI5p25kBwp7tI7k1R1O7TUzYo= X-Google-Smtp-Source: ABdhPJz6hTrgDPfUJsuDL9GZOkNMjQBehnruAm8xHuZo6iJTX4FzH5caCuFx7w1pjHoK3Ar3JKa9Vw== X-Received: by 2002:a17:907:9713:: with SMTP id jg19mr39715205ejc.364.1637948624270; Fri, 26 Nov 2021 09:43:44 -0800 (PST) Received: from tom-desktop.station (net-2-39-74-150.cust.vodafonedsl.it. [2.39.74.150]) by smtp.gmail.com with ESMTPSA id sd28sm3841946ejc.37.2021.11.26.09.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 09:43:43 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, andrey.zhizhikin@leica-geosystems.com, Tommaso Merciai , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , Ye Li , Marek Vasut , Simon Glass , Frieder Schrempf , Harald Seiler , "Ying-Chun Liu (PaulLiu)" , u-boot@lists.denx.de Subject: [RFC PATCH 2/3] imx: imx8mn_evk: override env_get_location Date: Fri, 26 Nov 2021 18:43:30 +0100 Message-Id: <20211126174331.5928-3-tomm.merciai@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126174331.5928-1-tomm.merciai@gmail.com> References: <20211126174331.5928-1-tomm.merciai@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 26 Nov 2021 18:51:30 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.2 at phobos.denx.de X-Virus-Status: Clean Override env_get_location function at board level, previously dropped down from soc.c References: - commit f1575f23df1ef704051f218d5bc4aeeb20c2c542 Signed-off-by: Tommaso Merciai --- Changes since v1: - Remove wrong env_get_offset function from commit board/freescale/imx8mn_evk/imx8mn_evk.c | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c index 9a0a0488bf..ef89a91ea2 100644 --- a/board/freescale/imx8mn_evk/imx8mn_evk.c +++ b/board/freescale/imx8mn_evk/imx8mn_evk.c @@ -5,11 +5,53 @@ #include #include +#include #include +#include +#include #include DECLARE_GLOBAL_DATA_PTR; +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_NAND + case NAND_BOOT: + env_loc = ENVL_NAND; + 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; +} + int board_init(void) { return 0; From patchwork Fri Nov 26 17:43:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1560280 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LZZUeo80; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4J12Pc57f2z9s5P for ; Sat, 27 Nov 2021 04:52:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FF3083743; Fri, 26 Nov 2021 18:51:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.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=gmail.com header.i=@gmail.com header.b="LZZUeo80"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 48F9C830A7; Fri, 26 Nov 2021 18:43:52 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 81A8F8373E for ; Fri, 26 Nov 2021 18:43:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tomm.merciai@gmail.com Received: by mail-ed1-x532.google.com with SMTP id z5so41981113edd.3 for ; Fri, 26 Nov 2021 09:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rhAeQKukuw87yoGy/ozc6cLE7sqCGV3y9h8lZRKIFNw=; b=LZZUeo80VJg2f10RemPhbBwnW+cPRygbF/NPQAApH8HYCdkgmJN3r2FDGiWgtmVRV3 73/HTdKWUvI8ijMcvNPXt+O2fF+V3ciT7CPRO2UNp2gvHqkVEu0M/O9D7n6GjNY7xRC5 LMi0KcBZEr7MR/Om4kuMkGWc9S13qHVZHRQODXvDT69z+WQsB7wAmg32NrcPK+SJnO1m z4R6gr4emdaSVWOJl3azR3oHS6ADw28TrWGgqm+3+i+Wv8Ve3EG/NB5qqptwdov+Es2w DvL6/U4OGAakIhEDNzAwysQlOq2gXuzuuvd2+8+wsbknrOSImpSaqB0uD+nLOE6Xryoj u0Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rhAeQKukuw87yoGy/ozc6cLE7sqCGV3y9h8lZRKIFNw=; b=mtZ7HxY7N/11yrK+JP6bi90IyyD4eJVI7WS1piWp1fDZYtLOz7dI7ghXtRDa+ABqaz PnQ7nxxj53yvAaWrieM5uSlYkWIVAxM3/KuqI1ll55FWSMW1ht5qakua5RAhTcpFM71x fzEDpQFyRzcq7p+9ExvUvRsl/Zby9CjD+qGRFmOap2oUvZX8uV+hhBb1QeD9J11YTnsv rAtNEgTf3Ab50/bRqJOOpmOfmHEWc5YF8PJTo4yRbfSd4YlwDGV5Bcb71xvw6zWZubK4 RvejRQ9eejM2ZYWEFhDGQDlkY5YKx+hfu+fTPHJRhdXEUxOTDz5j5jCrEwkl431/dwaI 8LUQ== X-Gm-Message-State: AOAM533x6/chlcMB1kfeu544k+qlviiDHm+s49O9rPVkJEA2y/GuTcuu GAu7OLw96P9g4dvcCdirupM= X-Google-Smtp-Source: ABdhPJxD8ZbNAvhbrsJbcnzFU2xEudpd6p4Ll5YLhKKv8+kngI2BOTqiLpP8Bb66KcSZsF9S9dpmlA== X-Received: by 2002:a17:907:9607:: with SMTP id gb7mr41000555ejc.441.1637948628160; Fri, 26 Nov 2021 09:43:48 -0800 (PST) Received: from tom-desktop.station (net-2-39-74-150.cust.vodafonedsl.it. [2.39.74.150]) by smtp.gmail.com with ESMTPSA id sd28sm3841946ejc.37.2021.11.26.09.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 09:43:47 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, andrey.zhizhikin@leica-geosystems.com, Tommaso Merciai , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , Ye Li , Marek Vasut , Simon Glass , Frieder Schrempf , =?utf-8?q?Marek_Beh=C3=BAn?= , Harald Seiler , "Ying-Chun Liu (PaulLiu)" , u-boot@lists.denx.de Subject: [RFC PATCH 3/3] imx: imx8mp_evk: override env_get_location Date: Fri, 26 Nov 2021 18:43:31 +0100 Message-Id: <20211126174331.5928-4-tomm.merciai@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126174331.5928-1-tomm.merciai@gmail.com> References: <20211126174331.5928-1-tomm.merciai@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 26 Nov 2021 18:51:30 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.2 at phobos.denx.de X-Virus-Status: Clean Override env_get_location function at board level, previously dropped down from soc.c References: - commit f1575f23df1ef704051f218d5bc4aeeb20c2c542 Signed-off-by: Tommaso Merciai --- Changes since v1: - Remove wrong env_get_offset function from commit board/freescale/imx8mp_evk/imx8mp_evk.c | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index 62096c24fb..6b2eeaf152 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -32,6 +34,45 @@ static iomux_v3_cfg_t const wdog_pads[] = { MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; +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_NAND + case NAND_BOOT: + env_loc = ENVL_NAND; + 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; +} + int board_early_init_f(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR;