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 40D6BC433F5 for ; Sat, 25 Dec 2021 20:27:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 550BF837EE; Sat, 25 Dec 2021 21:26:50 +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="c3eF0h1e"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B05483762; Sat, 25 Dec 2021 21:26:35 +0100 (CET) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (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 75FF0831E9 for ; Sat, 25 Dec 2021 21:26:28 +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-x52a.google.com with SMTP id f5so45676662edq.6 for ; Sat, 25 Dec 2021 12:26:28 -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=5N95ZJD38vy4ISBTlY8wOAgYYY4/zQcoFqO7OVEMHK8=; b=c3eF0h1ekMTLgcK5N2UUBzeFs4xKV0tmuTZrbXi60gQCdm4VBrHeWcPybs1PFXo8Kt Ni1LPH8NToUndOqYKp5ycPelS8PF/edVJy6X7MV8TJjYxWVTVgzTwenBmd81uPGC5Hp9 19Rd8i0AI8yCbmN8SGZoHV5yUmiI5gEy7MFNO6QHrVANjA0mV6xuk1ljF/V/g3F9Gzuu Rr54Gw7P0qX0KiwaqmeHbyt5HQ0q6l0X42Qa8l6y6kVW7jiztYIOExm8W431rMw8yi1E Z5b7Ho7eQl0OdhMPSmm3yP63U1ln+KNjwJRn5G+xMRRW5sKIYP4Kx+v7wWhieIrSVm42 GVqg== 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=5N95ZJD38vy4ISBTlY8wOAgYYY4/zQcoFqO7OVEMHK8=; b=6dzt/nxggZnGSEEThTxLTZLZWM5rwUg5Sf53MW7H0GWqe8QEXIJHuS8sv7RHuyaLRV +CCDdxJoQ3w5hGMwXf2JNT+2hABszbRcyuLy4d789cvhAX26Q1mwGmn1cFTYyDjEVk9E 7XhzOS9KzHmWkeADvkk3wpI2dgfI69JjzN6vafPZj/Z6kcmrh4+Y4V6F3RuuQ3eV8+K6 5fxIj4C4M/GsKE2NPjxOTSELNGzJYRKtyZWcH+DcJLMRiXLHwabFpqGFD+iZxIaR8O02 L0md3ign20bdqSYVUIjwdk63zORZgUU8LhF6izxtJOzwpFrWTYwJ2oC6fhCiuOc0qYhL 00Aw== X-Gm-Message-State: AOAM5321l/eZtgQl2mUbulMCB59KjfToZphGagN3ki+yxSKG+biBpbOC /ifMav/cNIuTlDscMhvOnyA= X-Google-Smtp-Source: ABdhPJw2qJFfM2d82k+9HiTJ2YWz9QCvC8yrxpn3Eos/VNjVQMtcew4gjxTc9wxgRfXcANRwrXcn8g== X-Received: by 2002:a17:907:1689:: with SMTP id hc9mr9010936ejc.228.1640463988128; Sat, 25 Dec 2021 12:26:28 -0800 (PST) Received: from tom-desktop.station (net-93-71-218-227.cust.vodafonedsl.it. [93.71.218.227]) by smtp.gmail.com with ESMTPSA id go10sm3684925ejc.100.2021.12.25.12.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Dec 2021 12:26:27 -0800 (PST) From: Tommaso Merciai To: Cc: tomm.merciai@gmail.com, michael@amarulasolutions.com, Adam Ford , Teresa Remmet , u-boot@lists.denx.de Subject: [RFC PATCH v3 4/5] beacon: imx8mn: override env_get_location in imx8mn_beacon.c Date: Sat, 25 Dec 2021 21:25:53 +0100 Message-Id: <20211225202554.47853-5-tomm.merciai@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211225202554.47853-1-tomm.merciai@gmail.com> References: <20211225202554.47853-1-tomm.merciai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 arch/arm/mach-imx/imx8m/soc.c References: - commit 37d3e3bb95d7532e2503f115dd6c6762fd3b0262 Signed-off-by: Tommaso Merciai --- board/beacon/imx8mn/imx8mn_beacon.c | 35 ++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/board/beacon/imx8mn/imx8mn_beacon.c b/board/beacon/imx8mn/imx8mn_beacon.c index 7fe252b262..05ab5613ee 100644 --- a/board/beacon/imx8mn/imx8mn_beacon.c +++ b/board/beacon/imx8mn/imx8mn_beacon.c @@ -6,14 +6,47 @@ #include #include #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; +} + #if IS_ENABLED(CONFIG_FEC_MXC) static int setup_fec(void) { -- 2.25.1