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 98968C433EF for ; Thu, 21 Apr 2022 13:55:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52DED83AE6; Thu, 21 Apr 2022 15:55:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1650549311; bh=brgX3Zi4XZQbE5mlmtBV+onGU8ZowM5QUuw9Mt2F4Uw=; h=Date:Subject:To:Cc:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=LH4oYsvmBoX/TJvPNcku7QmNcAnalSJU+yHwUXcfBqghpjrgWdFwwmC40eNbg/Nx6 QbORiggGNZF3GboLAUFfE5mgscA8J91PxMUDcFwnUFndmqIIpFJA1ss3kxbL0h2m6t 9XAv95whoWd+CuVe+hy7AoxR7I+txlsj7LGjQVK3+KWTxeJRuf1JviMxN/jC8GOXc/ UesTZ2UOeLg4Y6fWaKA4TsinqqfrgcBnWihKaXS5d8nod+gpEpW7wSejdGHGHhTRIb r0u07UkRoYtJ3a/LUcgBZb11GUQPdlXqYcZvwvIY3s+Lc+vCawgYDF8YBe/jYdQrfY ZF6qvhx5fVC3Q== Received: by phobos.denx.de (Postfix, from userid 109) id E57FD83B46; Thu, 21 Apr 2022 15:55:08 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:101:465::107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EF9A883AD0 for ; Thu, 21 Apr 2022 15:55:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp102.mailbox.org (smtp102.mailbox.org [80.241.60.233]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4KkfDm3F62z9sRh; Thu, 21 Apr 2022 15:55:04 +0200 (CEST) Message-ID: Date: Thu, 21 Apr 2022 15:55:00 +0200 MIME-Version: 1.0 Subject: Re: [PATCH 1/2] Fix Espressobin build for configs where ENV is not in SPI Content-Language: en-US To: =?UTF-8?Q?Pali_Roh=c3=a1r?= , Rogier Stam , Marek Behun Cc: u-boot@lists.denx.de References: <1644362821-9002-1-git-send-email-rogier@unrailed.org> <1644362821-9002-2-git-send-email-rogier@unrailed.org> <20220228071005.272i3ix5ned4bpon@pali> From: Stefan Roese In-Reply-To: <20220228071005.272i3ix5ned4bpon@pali> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean On 2/28/22 08:10, Pali Rohár wrote: > + Marek, Stefan > > On Wednesday 09 February 2022 00:27:00 Rogier Stam wrote: >> When storing the UBoot Environment in for example EXT4, >> the U-Boot build is broken for several reasons: >> 1. armada-385-turris-omnia-u-boot.dtsi will not allow >> CONFIG_ENV_OFFSET and CONFIG_ENV_SIZE to be undefined >> 2. armada-37xx/board.c ft_board_setup function does not >> exist if CONFIG_ENV_IS_IN_SPI_FLASH is not defined >> >> This commit changes these files so that selecting a >> different location for the environment is possible. >> >> Signed-off-by: Rogier Stam > > Reviewed-by: Pali Rohár Applied to u-boot-marvell/master Thanks, Stefan >> --- >> arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi | 2 ++ >> board/Marvell/mvebu_armada-37xx/board.c | 4 +++- >> 2 files changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi >> index 3ff76c9..008787e 100644 >> --- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi >> +++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi >> @@ -38,6 +38,7 @@ >> }; >> }; >> >> +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH >> &spi0 { >> u-boot,dm-pre-reloc; >> >> @@ -56,6 +57,7 @@ >> }; >> }; >> }; >> +#endif >> >> &uart0 { >> u-boot,dm-pre-reloc; >> diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c >> index d7b6eca..5bace0c 100644 >> --- a/board/Marvell/mvebu_armada-37xx/board.c >> +++ b/board/Marvell/mvebu_armada-37xx/board.c >> @@ -328,9 +328,10 @@ int board_network_enable(struct mii_dev *bus) >> return 0; >> } >> >> -#if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_ENV_IS_IN_SPI_FLASH) >> +#ifdef CONFIG_OF_BOARD_SETUP >> int ft_board_setup(void *blob, struct bd_info *bd) >> { >> +#ifdef CONFIG_ENV_IS_IN_SPI_FLASH >> int ret; >> int spi_off; >> int parts_off; >> @@ -424,6 +425,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) >> return 0; >> } >> >> +#endif >> return 0; >> } >> #endif >> -- >> 2.7.4 >> Viele Grüße, Stefan Roese -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de