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 509AFC433EF for ; Sun, 28 Nov 2021 17:47:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5545080F4C; Sun, 28 Nov 2021 18:47:20 +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="Dx5pyDyF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E76581244; Sun, 28 Nov 2021 18:47:18 +0100 (CET) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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 C3BB980F9D for ; Sun, 28 Nov 2021 18:47:14 +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-x52f.google.com with SMTP id r25so61881427edq.7 for ; Sun, 28 Nov 2021 09:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=eDxqEt0Vo/5v0cy4WJrSQ6OzsRvjLRUbMx+X5IV1yew=; b=Dx5pyDyFHLLwR3mOkcxsqB5fTIOjpvv15SW25ZRlLsIZnjRjVkszzlp6lJRqsLXhvk nSNJ2rbr2VyGDBX6xSdgIyf7yavskfwXGgn885r90PQ3hVgvSXwag8F7wzZuATPAR6Bp qgx54UEPNivU6aiS8zhBMt5SkFhLvVP85u5OMnmupI62dPni8DQMcDCSsOsm0Riw3fiQ tkUjLvSswVqjDl9GyZ8Pn04LrXV9Tm3wfN+yub6fj3znBpqTJJXdKL9Ke2C9Zr//4n/l cC5SYjxY4AaHFTHRmImxsuUePYuysXCU10KENdudIlrxyfC/M/MI0pDv6/1VIX+Qz61P 2IEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=eDxqEt0Vo/5v0cy4WJrSQ6OzsRvjLRUbMx+X5IV1yew=; b=ukTwGyxCgmqG11jiMkKc9OXotGUAZCShyme1Cx8pbfmHwSaup8FEpG4K3tRu8ZB95B wIoSuQ07OTq4pvJSBW2WUWbIOVakGTFUKhkFHjHfaZE0/gn7h0UZXpNtc15ZclPtPmbH 6ti7GOAiLv5cfPFqMCrE1Pdx0EilUI6NXLh1oWvOoVNQ8Qe4VflNTZhpOuWdHhq6z2G7 CsFmCZ8zdKJF/vJajllAXxkbNh+qadWJaA4RtPDQm0JkGYDDJrvkoCYGLu7RUT5+L2iu Zgz70DRaIWiEKbITjUwGmqAhiO6DCmHbKAqbVfPdTWRKY2RAgmmpkQDzF1+3nPf2pPzz MRbw== X-Gm-Message-State: AOAM533Aqx3sij317m5oVjbwrJCZ6xbmXOtrCrVzG6XPZpWyQEyzG/UL E6JypWGBNgQZeCbi60mZxzU= X-Google-Smtp-Source: ABdhPJzFt/lfz4PkKiuTMovMZcnHeULgx/UPodplfPGDnvIVrhZBk/JR3n6Sa2aEBtP54pJB/CzXOQ== X-Received: by 2002:a17:907:7b98:: with SMTP id ne24mr57912638ejc.14.1638121634248; Sun, 28 Nov 2021 09:47:14 -0800 (PST) Received: from tom-desktop (net-2-39-74-150.cust.vodafonedsl.it. [2.39.74.150]) by smtp.gmail.com with ESMTPSA id p26sm7426700edt.94.2021.11.28.09.47.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Nov 2021 09:47:13 -0800 (PST) Date: Sun, 28 Nov 2021 18:47:11 +0100 From: Tommaso Merciai To: Marek =?iso-8859-1?Q?Beh=FAn?= 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: <20211128174711.GA4938@tom-desktop> References: <20211126174331.5928-1-tomm.merciai@gmail.com> <20211126174331.5928-4-tomm.merciai@gmail.com> <20211126190021.7d8428af@thinkpad> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211126190021.7d8428af@thinkpad> 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, Nov 26, 2021 at 07:00:21PM +0100, Marek Behún wrote: > 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 Hi Marek, Thanks for your review. What do you think about this solution? 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; } Let me know. Thanks, tommaso