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;