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 2E480C433F5 for ; Fri, 26 Nov 2021 18:00:33 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4599F83681; Fri, 26 Nov 2021 19:00:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz 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; secure) header.d=nic.cz header.i=@nic.cz header.b="G+jXE/LD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C99FE8327C; Fri, 26 Nov 2021 19:00:28 +0100 (CET) Received: from mail.nic.cz (mail.nic.cz [217.31.204.67]) (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 8D439830A7 for ; Fri, 26 Nov 2021 19:00:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from thinkpad (unknown [172.20.6.87]) by mail.nic.cz (Postfix) with ESMTPSA id F047B13FD2C; Fri, 26 Nov 2021 19:00:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1637949624; bh=Qz8p6HU8J2gh3bopQ0csclxpylIk8CWlT+oTVSEUGPU=; h=Date:From:To; b=G+jXE/LDQtrKKJmp97BLtL8+EyV16LYMJ+EtWbW19R7CHkFSKgQ/DjieqNw692jqH 5tAAJoHRCGFWRdktAL8bS02NI7wmtqGvyFbrpOoZ9m7VVEscx82018Ix1QB4A7k1pP tZR9vct4q4WUQ0+ItnFD/TPlwFSTIRwotiFSBPK4= Date: Fri, 26 Nov 2021 19:00:21 +0100 From: Marek =?UTF-8?B?QmVow7pu?= To: Tommaso Merciai Cc: michael@amarulasolutions.com, andrey.zhizhikin@leica-geosystems.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: Re: [RFC PATCH 3/3] imx: imx8mp_evk: override env_get_location Message-ID: <20211126190021.7d8428af@thinkpad> In-Reply-To: <20211126174331.5928-4-tomm.merciai@gmail.com> References: <20211126174331.5928-1-tomm.merciai@gmail.com> <20211126174331.5928-4-tomm.merciai@gmail.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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 On Fri, 26 Nov 2021 18:43:31 +0100 Tommaso Merciai wrote: > 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 Using if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) instead of #ifdefs is preferred because the compiler then warns about bugs even in the disabled codepaths (that's why checkpatch complains about #ifdefs). I know that this cannot be combined with switch() in a simple way, though. Do you need to use switch? Can't you rewrite it to use if()s and use IS_ENABLED()? Marek