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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40996C433F5 for ; Thu, 21 Oct 2021 08:38:27 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6996B60FC3 for ; Thu, 21 Oct 2021 08:38:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6996B60FC3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 831FD83405; Thu, 21 Oct 2021 10:38:23 +0200 (CEST) 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="mIBY8YhB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C55F883374; Thu, 21 Oct 2021 10:38:19 +0200 (CEST) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 D67668343E for ; Thu, 21 Oct 2021 10:38:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=cryosay@gmail.com Received: by mail-ed1-x529.google.com with SMTP id d3so2513542edp.3 for ; Thu, 21 Oct 2021 01:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=p8ozTs558HgLIXb1mz0TD1PEHGeFG0+xVPRQhRNYqGA=; b=mIBY8YhB3ANyGdNCgKMy7AUngCICE3ymtGweXf7hxq1jAqeQVhsSQMLsSP2pG6/IU9 kuXhSx6UUJueZnIIKTBWrJlW7IY3NtyE/9PcyIO3kmYabb98udnH96sapxUcIJEjQRQD chFW8oh+kiiY5CAUB5OsDA/W3w2qLBavWCMBRoDNXlOj2FaUL0NbEg9LdPZDX/pYploX gplucy+TR5aoYnsUdBQBBFlGzU3FlxA4n+gk8GtMU4BgsOQA2jfIlQhAOKqqUUWiZE7i QeTeWZzo/V2gvZ9OwoPMz3Lbx4f+vrBzVicqkgcy3qxk8oUhqpRU8EfofRiX7YH/iLAG lGuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=p8ozTs558HgLIXb1mz0TD1PEHGeFG0+xVPRQhRNYqGA=; b=0CW2R90oytlJjjDwD1XHxTZCggj7ZHlhT6d/vPWw0k7dtzQmlW13VoZpFi79DDTgdz SXBr2Ps5EzrrYlObRFUzces+b3kM1euxktjIQxoZ7eyFQnr2CMdsKF7UoZqp2PeBPRsK hA5tRzoEIo/nCTN7jiTv+xADR7KBTnKf+nfTT7IpbtrRblHJ5YDSFNQz8qTluDlZggEG rQ9HAYulYzxAq27Qs89jE0IeJV4Dk6Gw6PLMIoUjaPZwm6kipG6KbpkJIkBvCWjMlXDW NN5b1CoL2ycHwwXZPN3yu+0cztE9Q3Yg7mKuhkXTM5Yc/y40E8QPdfa4Y9QDnDyN7NNk SOkQ== X-Gm-Message-State: AOAM533IUGeq633BsxfWblUbfgolmD4Dy9yvV0p3h4RfTz/kLBSC9jGR aWgVyFywSOInenk0FTRI5wDkHtFYXiYm6A52kZA= X-Google-Smtp-Source: ABdhPJz9/nogRDXD3Jj6rC0O1r+mCi8C63JW6VI3cmdVtpy8RR1snDMLZCaHqAXbC/SSRWrVbz0DuJeXWFuqCBfz1uM= X-Received: by 2002:a05:6402:2787:: with SMTP id b7mr5866402ede.238.1634805495294; Thu, 21 Oct 2021 01:38:15 -0700 (PDT) MIME-Version: 1.0 References: <20211020191626.3648540-1-ricardo@foundries.io> In-Reply-To: <20211020191626.3648540-1-ricardo@foundries.io> From: Oleksandr Suvorov Date: Thu, 21 Oct 2021 11:38:04 +0300 Message-ID: Subject: Re: [PATCH] ARM: imx8m: support env in fat and ext4 To: Ricardo Salveti Cc: U-Boot Mailing List , Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Peng Fan , Ye Li , Marek Vasut , Simon Glass , frieder.schrempf@kontron.de, Oleksandr Suvorov , Igor Opaniuk Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Wed, Oct 20, 2021 at 10:17 PM Ricardo Salveti wrote: > > Change boot device logic to also allow environment stored in fat and in > ext4 when booting from SD or from eMMC. > > As the boot device check for SD and for eMMC was depending on > ENV_IS_IN_MMC being defined, change the ifdef blocks at env_get_location > to use IS_ENABLED instead for all modes, returning NOWHERE when no valid > mode is found. > > Signed-off-by: Ricardo Salveti Reviewed-by: Oleksandr Suvorov > --- > arch/arm/mach-imx/imx8m/soc.c | 35 +++++++++++++++-------------------- > 1 file changed, 15 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c > index f2ddc834d4b..a3ce517a104 100644 > --- a/arch/arm/mach-imx/imx8m/soc.c > +++ b/arch/arm/mach-imx/imx8m/soc.c > @@ -1306,40 +1306,35 @@ void do_error(struct pt_regs *pt_regs, unsigned int esr) > 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; > + return ENVL_UNKNOWN; > > 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 > + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) > + return ENVL_SPI_FLASH; > + return ENVL_NOWHERE; > case NAND_BOOT: > - env_loc = ENVL_NAND; > - break; > -#endif > -#ifdef CONFIG_ENV_IS_IN_MMC > + if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) > + return ENVL_NAND; > + return ENVL_NOWHERE; > case SD1_BOOT: > case SD2_BOOT: > case SD3_BOOT: > case MMC1_BOOT: > case MMC2_BOOT: > case MMC3_BOOT: > - env_loc = ENVL_MMC; > - break; > -#endif > + if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC)) > + return ENVL_MMC; > + else if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) > + return ENVL_EXT4; > + else if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) > + return ENVL_FAT; > + return ENVL_NOWHERE; > default: > -#if defined(CONFIG_ENV_IS_NOWHERE) > - env_loc = ENVL_NOWHERE; > -#endif > - break; > + return ENVL_NOWHERE; > } > - > - return env_loc; > } > > #ifndef ENV_IS_EMBEDDED > -- > 2.33.0 > -- Best regards Oleksandr Oleksandr Suvorov cryosay@gmail.com