From patchwork Mon Jan 31 16:58:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1586891 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 (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=pHKt+vh3; 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 4JnZGn5P4jz9sFN for ; Tue, 1 Feb 2022 04:06:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A4AF836D1; Mon, 31 Jan 2022 18:06:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="pHKt+vh3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8C93837B6; Mon, 31 Jan 2022 17:59:09 +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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) (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 56C3A836BB for ; Mon, 31 Jan 2022 17:59:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tommaso.merciai@amarulasolutions.com Received: by mail-ej1-x636.google.com with SMTP id h7so45070207ejf.1 for ; Mon, 31 Jan 2022 08:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eXgponXlvIE0X2ipv9JxqiLqUDItUSIOczVCPOsmI1k=; b=pHKt+vh3dNokLZSNfqoteY0LjaWo/aY3QGH2l8dAPtIbmPfe5kSD7A+u7EhQ0QCttC cCypWfRgyMjNETf28c+F+Cmk1L5zdcMxpgepzTbb4D4E51mufXkmpLdKPdzmGMHHcVmF 7RutzMxXC1UWiRCAzx6ovhJB+2bxwsnNBC8vo= 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=eXgponXlvIE0X2ipv9JxqiLqUDItUSIOczVCPOsmI1k=; b=jCweMyPJjs8gHrT7Qf1/KvFovuA8TVSorzXFzcbUjyup6+EgjfhFO0AsUVFSQdqFvQ 7MC3Xhgf+dtj9WjhbAOMSy5oNpVMUAonCx1dqmMDP5FOA+skfsrvrWLdcFZlWQq0yvhk S2yrI5sYvFDn4mgaf/ZTxAYeWuFXYqFdglCf3qjNLMK+0dBajwe53XaKZ81iDBJyYEuB 91iEQT1+y70i9CyL/bNsjgqYP45FxKiMwq/ymOvsagAH7+3uTIOfgVg31T6bq+9h+u0h zroYDx/fv2/88XBCOESR4Nb/CGYL3OiIMX26EGzPhMnf4FlRwzZiLQ+FrRyRx+Jc5OHV rlxA== X-Gm-Message-State: AOAM532Lqg3103ld4KFdgSgPZLgSCvPmiJs6exUN7itdbW2g2fhnAiLR mKX/ISODRw4DIe47XOeC0HNhdg== X-Google-Smtp-Source: ABdhPJwxTQYh3oznU4RJZR1Qf6iOACyQua7pcwHw2v/XLERRnr6/z6xmHO6fKUey+Hhp9RVFPU4NmA== X-Received: by 2002:a17:907:7f0d:: with SMTP id qf13mr14439360ejc.446.1643648343552; Mon, 31 Jan 2022 08:59:03 -0800 (PST) Received: from tom-ThinkPad-T14s-Gen-2i.station (net-188-217-50-123.cust.vodafonedsl.it. [188.217.50.123]) by smtp.gmail.com with ESMTPSA id jl17sm13949507ejc.16.2022.01.31.08.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 08:59:03 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, aford173@gmail.com, tommaso.merciai@amarulasolutions.com, 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 , u-boot@lists.denx.de Subject: [PATCH v4 1/4] imx8m: drop env_get_location for imx8mn and imx8mp Date: Mon, 31 Jan 2022 17:58:55 +0100 Message-Id: <20220131165859.261923-2-tommaso.merciai@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> References: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 31 Jan 2022 18:06:21 +0100 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 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 --- 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 Mon Jan 31 16:58:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1586892 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 (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=IlmfeYyq; 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 4JnZGz65VWz9s5B for ; Tue, 1 Feb 2022 04:06:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CCAF6837C7; Mon, 31 Jan 2022 18:06:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="IlmfeYyq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0B6B983695; Mon, 31 Jan 2022 17:59:13 +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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) (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 2315A8366A for ; Mon, 31 Jan 2022 17:59:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tommaso.merciai@amarulasolutions.com Received: by mail-ej1-x62c.google.com with SMTP id o12so44897936eju.13 for ; Mon, 31 Jan 2022 08:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tpsZ79vXEgNt2kdL/F0p/RJA6Y9O896Si8Fyvd4Ik9M=; b=IlmfeYyqLih+LjcP7OSjr6ntml4PiRFlUdG1AayTR2qpfDI4DAqpFJh/qsYAOELqW3 FuIuGu54t4+EoCrL8kw34j1KZf5PmN/M9Idqu+S8yxo0ispJvszfqgVSqA+VnYpiKri4 6Bpl3MUKV3ZBZmBopyDU/oMHesKWtp0ZFFrqI= 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=tpsZ79vXEgNt2kdL/F0p/RJA6Y9O896Si8Fyvd4Ik9M=; b=UfmabeCcm1AEJNwBImjtWjk/jTeY85wjRk4cACPEP+KAT1p3gdlwWCOjlfEvo662tK xipsExYCEKwRdB8qLR3X6X65KR/H6D6hyf1U8uIHRAG/d7oEIeNmu+8Txyf2shaT099t SbeXV5KxsdY7L1WPlsRZdhNi5ljgTdATGQQohNpSDXn3q68CM6xHZfvBdG74viFDRUSp SZ7knAK9hz5xf4UBiCRiBK5jvoow8Pk1q+elnU6SU18da4ozB2/nxsPShsdZDhVwFaNm NNsYcdCP2Ru6EZLwrf1HU5HM9g8Mh+NgQJI40ZU+2W+ATq6LFja2kzonwIP4J02QArUf DBWg== X-Gm-Message-State: AOAM530tO3P1xRJj6Dxsf03F5kaj/Ov0cfI79GlIz/p9HIU4cRBzCcwP IfHWma2AhFoW/469Bkws5Ami3g== X-Google-Smtp-Source: ABdhPJzbKkvtJar56O/PtOEl38LybthNBYxoGZhDcrRiRcd7UmfN2idkGgel5SurLBgEbntoLSmk+g== X-Received: by 2002:a17:907:1b0b:: with SMTP id mp11mr17545338ejc.382.1643648345790; Mon, 31 Jan 2022 08:59:05 -0800 (PST) Received: from tom-ThinkPad-T14s-Gen-2i.station (net-188-217-50-123.cust.vodafonedsl.it. [188.217.50.123]) by smtp.gmail.com with ESMTPSA id jl17sm13949507ejc.16.2022.01.31.08.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 08:59:05 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, aford173@gmail.com, tommaso.merciai@amarulasolutions.com, 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: [PATCH v4 2/4] imx: imx8mn_evk: override env_get_location Date: Mon, 31 Jan 2022 17:58:56 +0100 Message-Id: <20220131165859.261923-3-tommaso.merciai@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> References: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 31 Jan 2022 18:06:21 +0100 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 Override env_get_location function at board level, previously dropped down from soc.c References: - commit 98af80d3c969e69a1b8ce98bb20e5ad844022da2 Signed-off-by: Tommaso Merciai --- Changes since v1: - Fix code indentation using checkpatch as suggested by MBehún board/freescale/imx8mn_evk/imx8mn_evk.c | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c index 9a0a0488bf..ec1ab202a6 100644 --- a/board/freescale/imx8mn_evk/imx8mn_evk.c +++ b/board/freescale/imx8mn_evk/imx8mn_evk.c @@ -5,11 +5,46 @@ #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; + + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) && dev == QSPI_BOOT) { + env_loc = ENVL_SPI_FLASH; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND) && dev == NAND_BOOT) { + env_loc = ENVL_NAND; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC)) { + switch (dev) { + case SD1_BOOT: + case SD2_BOOT: + case SD3_BOOT: + case MMC1_BOOT: + case MMC2_BOOT: + case MMC3_BOOT: + env_loc = ENVL_MMC; + break; + default: + break; + } + } else if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) { + env_loc = ENVL_MMC; + } + + return env_loc; +} + int board_init(void) { return 0; From patchwork Mon Jan 31 16:58:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1586894 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 (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=Q+/Xe/Lq; 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 4JnZHQ1h9Jz9s5B for ; Tue, 1 Feb 2022 04:07:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 95FED8380F; Mon, 31 Jan 2022 18:06:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="Q+/Xe/Lq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C9498359C; Mon, 31 Jan 2022 17:59:21 +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,SPF_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_HELO_TEMPERROR autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 96755836D1 for ; Mon, 31 Jan 2022 17:59:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tommaso.merciai@amarulasolutions.com Received: by mail-ej1-x62f.google.com with SMTP id h7so45070796ejf.1 for ; Mon, 31 Jan 2022 08:59:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uRzRGUKGzqgRFBRMmc6RsiAJ9ZE4UqAiH6OC4X/wdU4=; b=Q+/Xe/Lq0UhO9uXbbpp2gQgNGQOtoasxXuhMfJp3ik8R0c+HFqFijUqEXcEP2Is/N9 X5huM6EL/O8pF/RJfABZyR4cto3moOgO7+UQyd+KQMBF8DD3/Hl/6LtEAJqvXKCcPhPI A6oDPbkW8UnyrlsyBZ45C7Nh5g7iettJazhrI= 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=uRzRGUKGzqgRFBRMmc6RsiAJ9ZE4UqAiH6OC4X/wdU4=; b=h5vQPjgJQRByhHta9irksLLB7Fp7hrseM72YKPDTU8CQQNpE4OWvH6X4FX+Ugg2/rF 9uUowOMUjNcRMNF81MBLq9RIrLciDDkxs9T2xe7zH0zwfkivqiC6AaCn81ENtezWkaWv lP7/5Ql6ltZkZK1D8fG1nZltnlPrc9pSNaGrY27N+K2F4VsYGdzXSqFA5LCVOKF2U0e0 D4IOAdCCE9yldX8p86C10r+KUruqZ2MmWYc/p+eVFnl4yk1bqijvq+15Puqm367zuFty ajI7Wez4KLPqs4tX9ohQ1wmM2TrnRQfmrtMDfgCkQcPnD/Qgkx63sJlBKn8WepjT1INO s+nw== X-Gm-Message-State: AOAM533Ue1Noi81sd9VhUacqkGU4Vxr3sT69Rh6w343zKv9F8eKbvS20 05c3e/5EF78mpKpZ6pgfzBUquQ== X-Google-Smtp-Source: ABdhPJx6eittsKAvx8PCQU+g5LhbK770xOwXO3s2j8VYN9OSBC19glnn/cYLSXxy4GqjNTsSNoap6g== X-Received: by 2002:a17:907:a413:: with SMTP id sg19mr17914176ejc.28.1643648348251; Mon, 31 Jan 2022 08:59:08 -0800 (PST) Received: from tom-ThinkPad-T14s-Gen-2i.station (net-188-217-50-123.cust.vodafonedsl.it. [188.217.50.123]) by smtp.gmail.com with ESMTPSA id jl17sm13949507ejc.16.2022.01.31.08.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 08:59:07 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, aford173@gmail.com, tommaso.merciai@amarulasolutions.com, Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , Ye Li , Simon Glass , Marek Vasut , Frieder Schrempf , "Ying-Chun Liu (PaulLiu)" , u-boot@lists.denx.de Subject: [PATCH v4 3/4] imx: imx8mp_evk: override env_get_location Date: Mon, 31 Jan 2022 17:58:57 +0100 Message-Id: <20220131165859.261923-4-tommaso.merciai@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> References: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 31 Jan 2022 18:06:21 +0100 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 Override env_get_location function at board level, previously dropped down from soc.c References: - commit 98af80d3c969e69a1b8ce98bb20e5ad844022da2 Signed-off-by: Tommaso Merciai --- Changes since v1: - Fix code indentation using checkpatch as suggested by MBehún board/freescale/imx8mp_evk/imx8mp_evk.c | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index 62096c24fb..8548f606d2 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,38 @@ 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; + + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) && dev == QSPI_BOOT) { + env_loc = ENVL_SPI_FLASH; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND) && dev == NAND_BOOT) { + env_loc = ENVL_NAND; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC)) { + switch (dev) { + case SD1_BOOT: + case SD2_BOOT: + case SD3_BOOT: + case MMC1_BOOT: + case MMC2_BOOT: + case MMC3_BOOT: + env_loc = ENVL_MMC; + break; + default: + break; + } + } else if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) { + env_loc = ENVL_MMC; + } + + return env_loc; +} + int board_early_init_f(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; From patchwork Mon Jan 31 16:58:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommaso Merciai X-Patchwork-Id: 1586893 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 (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=oFVujfar; 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 4JnZHB6ZHmz9s5B for ; Tue, 1 Feb 2022 04:07:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CD5F8837EC; Mon, 31 Jan 2022 18:06:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="oFVujfar"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1D91C83076; Mon, 31 Jan 2022 17:59:16 +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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) (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 2A2EF8368E for ; Mon, 31 Jan 2022 17:59:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tommaso.merciai@amarulasolutions.com Received: by mail-ej1-x635.google.com with SMTP id k25so44691626ejp.5 for ; Mon, 31 Jan 2022 08:59:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a5+097pOWeKm7tGI5lm09/yTwsl5DwPrjp/TyYBQ4ww=; b=oFVujfarbYT9tQz91DAQrkvO9+3BWi8ozLg9SgkBBaG/XMv8fWVR4Xtcim6C7lvwNi s6utCE1TYdEFJDn9IWDJh8RWTkq+4eaqRL0RpZfxRjuot8mpB1flDzeRM8NsbKqW1Nnc ADFjElMiRWNaYcEUlDRnE6NXZFe3iFheqSzYY= 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=a5+097pOWeKm7tGI5lm09/yTwsl5DwPrjp/TyYBQ4ww=; b=oWgbLKKKBq6Nu7R+fGScqvbkc1Y1GzfIagWnh3DimCHNgZh6Wu4WLgtOpkRHD1Q6fN lF83LOQn69J3eWx0z3ScfxpFcRhKQ5PabRI8gSY60NWntGNplPwDeQ2Mgh79UsnqD161 GPo3Jo6o3LzYdN8G43MMZ9JGVlB1kfl0QgsbA7rNgWGiRUcuDuAvyIcSrUuhk3lXS4iC /fAsr3XQ4Z8vQFkNF++zhWmrQ5suqd6JX2WGa6Sgeuy5lYPSCavaHPt/vP1D+WyUx5Jx PiAp/iWclEWAG6I+/USgq/wRMg65mdFIEdsJ1yNHvZ9yHQRn02seUYkEmjdmRooE4m+z IiFw== X-Gm-Message-State: AOAM533YzB0hSKs6d5KYWEuCegU4qx0YZA/Bo6Esw0oQjbKqARqrk+9T KHsMOnoa503I2IziqssdU/KkpQ== X-Google-Smtp-Source: ABdhPJwiB3/e53sEf60GE66QuvCHHQKh9mnA0ueGWt1AsMp8zu+4RMHm55scDtZHueaaBcvBgv1EOA== X-Received: by 2002:a17:906:478c:: with SMTP id cw12mr17463348ejc.214.1643648350764; Mon, 31 Jan 2022 08:59:10 -0800 (PST) Received: from tom-ThinkPad-T14s-Gen-2i.station (net-188-217-50-123.cust.vodafonedsl.it. [188.217.50.123]) by smtp.gmail.com with ESMTPSA id jl17sm13949507ejc.16.2022.01.31.08.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 08:59:10 -0800 (PST) From: Tommaso Merciai To: Cc: michael@amarulasolutions.com, aford173@gmail.com, tommaso.merciai@amarulasolutions.com, Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Teresa Remmet , Peng Fan , Ye Li , Simon Glass , Marek Vasut , Frieder Schrempf , Harald Seiler , =?utf-8?q?Marek_Beh=C3=BAn?= , u-boot@lists.denx.de Subject: [PATCH v4 4/4] phytec: phycore_imx8mp: override env_get_location Date: Mon, 31 Jan 2022 17:58:58 +0100 Message-Id: <20220131165859.261923-5-tommaso.merciai@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> References: <20220131165859.261923-1-tommaso.merciai@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 31 Jan 2022 18:06:21 +0100 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 Override env_get_location function at board level, previously dropped down from arch/arm/mach-imx/imx8m/soc.c References: - commit 98af80d3c969e69a1b8ce98bb20e5ad844022da2 Signed-off-by: Tommaso Merciai --- board/phytec/phycore_imx8mp/phycore-imx8mp.c | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/board/phytec/phycore_imx8mp/phycore-imx8mp.c b/board/phytec/phycore_imx8mp/phycore-imx8mp.c index a8f0821437..05926eefa3 100644 --- a/board/phytec/phycore_imx8mp/phycore-imx8mp.c +++ b/board/phytec/phycore_imx8mp/phycore-imx8mp.c @@ -11,9 +11,42 @@ #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; + + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) && dev == QSPI_BOOT) { + env_loc = ENVL_SPI_FLASH; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND) && dev == NAND_BOOT) { + env_loc = ENVL_NAND; + } else if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC)) { + switch (dev) { + case SD1_BOOT: + case SD2_BOOT: + case SD3_BOOT: + case MMC1_BOOT: + case MMC2_BOOT: + case MMC3_BOOT: + env_loc = ENVL_MMC; + break; + default: + break; + } + } else if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) { + env_loc = ENVL_MMC; + } + + return env_loc; +} + static int setup_fec(void) { struct iomuxc_gpr_base_regs *gpr =