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 CF04CC433F5 for ; Mon, 29 Nov 2021 12:17:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1234A8142D; Mon, 29 Nov 2021 13:17:52 +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="aFtcSIDs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E23D82F70; Mon, 29 Nov 2021 13:17:50 +0100 (CET) Received: from mail.nic.cz (lists.nic.cz [IPv6:2001:1488:800:400::400]) (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 49B688020E for ; Mon, 29 Nov 2021 13:17:46 +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 82E411409F3; Mon, 29 Nov 2021 13:17:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1638188265; bh=bC2yyLHVfxP+A+bKoEBRZXm3Nd/STLJCN3pcZjheM7s=; h=Date:From:To; b=aFtcSIDsVA8TdT4/Eo11XJ4Zu9QsZwdLNufr7NrG5VuUXxOjRChNUZIs0H+2AnLqy t5Q8qJCEZ6L1BE7DPgaavdovYn7xGX+MZpiibow/gkKCe+QDNpY+3RdIUB0mqq3kF/ QsFRiFrN7V4y+X7QveGlOeR3wGd9pvI/Ty1eKd7k= Date: Mon, 29 Nov 2021 13:17:44 +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: <20211129131744.28234486@thinkpad> In-Reply-To: <20211128174711.GA4938@tom-desktop> References: <20211126174331.5928-1-tomm.merciai@gmail.com> <20211126174331.5928-4-tomm.merciai@gmail.com> <20211126190021.7d8428af@thinkpad> <20211128174711.GA4938@tom-desktop> 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=UTF-8 Content-Transfer-Encoding: quoted-printable 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 Sun, 28 Nov 2021 18:47:11 +0100 Tommaso Merciai wrote: > On Fri, Nov 26, 2021 at 07:00:21PM +0100, Marek Beh=C3=BAn wrote: > > On Fri, 26 Nov 2021 18:43:31 +0100 > > Tommaso Merciai wrote: > > =20 > > > Override env_get_location function at board level, previously dropped > > > down from soc.c > > >=20 > > > References: > > > - commit f1575f23df1ef704051f218d5bc4aeeb20c2c542 > > >=20 > > > Signed-off-by: Tommaso Merciai > > > --- > > > Changes since v1: > > > - Remove wrong env_get_offset function from commit > > >=20 > > > board/freescale/imx8mp_evk/imx8mp_evk.c | 41 +++++++++++++++++++++++= ++ > > > 1 file changed, 41 insertions(+) > > >=20 > > > diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescal= e/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 @@ > > > =20 > > > #include > > > #include > > > +#include > > > #include > > > #include > > > #include > > > @@ -17,6 +18,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > =20 > > > DECLARE_GLOBAL_DATA_PTR; > > > =20 > > > @@ -32,6 +34,45 @@ static iomux_v3_cfg_t const wdog_pads[] =3D { > > > MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), > > > }; > > > =20 > > > +enum env_location env_get_location(enum env_operation op, int prio) > > > +{ > > > + enum boot_device dev =3D get_boot_device(); > > > + enum env_location env_loc =3D ENVL_UNKNOWN; > > > + > > > + if (prio) > > > + return env_loc; > > > + > > > + switch (dev) { > > > +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH > > > + case QSPI_BOOT: > > > + env_loc =3D ENVL_SPI_FLASH; > > > + break; > > > +#endif > > > +#ifdef CONFIG_ENV_IS_IN_NAND > > > + case NAND_BOOT: > > > + env_loc =3D 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 =3D ENVL_MMC; > > > + break; > > > +#endif > > > + default: > > > +#if defined(CONFIG_ENV_IS_NOWHERE) > > > + env_loc =3D ENVL_NOWHERE; > > > +#endif =20 > >=20 > > 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). > >=20 > > I know that this cannot be combined with switch() in a simple way, > > though. > >=20 > > Do you need to use switch? Can't you rewrite it to use if()s and use > > IS_ENABLED()? > >=20 > > Marek =20 >=20 > Hi Marek, > Thanks for your review. What do you think about this solution? >=20 > enum env_location env_get_location(enum env_operation op, int prio) > { > enum boot_device dev =3D get_boot_device(); > enum env_location env_loc =3D ENVL_UNKNOWN; >=20 > if (prio) > return env_loc; >=20 > if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH) && dev =3D=3D QSPI_BOOT) { > env_loc =3D ENVL_SPI_FLASH; > } > else if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND) && dev =3D=3D NAND_BOOT) { > env_loc =3D 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 =3D ENVL_MMC; > break; > default: > break; > } > } > else if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) { > env_loc =3D ENVL_MMC; > } >=20 > return env_loc; > } Thanks, this looks ok, just run it through checkpatch to correct the indentation of 'case' statements and put 'else if' on the same line as '}': if () { } else if () { } ... Marek