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 315BFC00144 for ; Mon, 1 Aug 2022 10:31:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 991BC8456D; Mon, 1 Aug 2022 12:31:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de 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=fris.de header.i=@fris.de header.b="krzW/mch"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1097C84506; Mon, 1 Aug 2022 12:30:55 +0200 (CEST) Received: from mail.fris.de (mail.fris.de [116.203.77.234]) (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 84F67844F4 for ; Mon, 1 Aug 2022 12:30:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=fris.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=frieder@fris.de Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 71C4FBFB51; Mon, 1 Aug 2022 12:30:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fris.de; s=dkim; t=1659349844; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=V6Q/9QzPza2i/DkMR5p2b9C+o7I9LAzx1/j2M8I49i8=; b=krzW/mch5JIyFmuk8gEXIpoRrazvC/TMCzooERTpa3Ia9+M+F+iPe2zfSLMMcnhrRkW9Ni bFsWnK/fYl9rZK44SaPfd36se6fNaYEg9AslLzavA1yvoNDSVh7y/fjStT+oxVcIUr3Wkm uEtt+0zSm63zE/fGO9ujj6vWFlIOI59Zdrt7DFPEaC73mUPiAqZsFUJDvxQgTy9d/E1BDN tVRktrSlxVYbMLC6cQtf8s/pLmw0H63u+3JKxPfKxpQlhGKnbC7IRN2uYbm5BmT9kiODTe rCIxlzvRHmeivY5mPqM/xSlCYSSh5cIhwHg5kedRSIsOJdpWzzQSu0L8rhK9zw== From: Frieder Schrempf To: Fabio Estevam , Frieder Schrempf , Stefano Babic , u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v2 06/19] imx: kontron-sl-mx8mm: Add redundant environment and SPI NOR partitions Date: Mon, 1 Aug 2022 12:30:08 +0200 Message-Id: <20220801103027.96820-7-frieder@fris.de> In-Reply-To: <20220801103027.96820-1-frieder@fris.de> References: <20220801103027.96820-1-frieder@fris.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 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.6 at phobos.denx.de X-Virus-Status: Clean From: Frieder Schrempf Enable the redundant environment feature to allow falling back in case of storage corruption. The partition layout for the SPI NOR device is added to the devicetree. Signed-off-by: Frieder Schrempf --- Changes in v2: * describe SPI NOR partitions in devicetree * move environment to end of SPI NOR --- arch/arm/dts/imx8mm-kontron-n801x-som.dtsi | 21 +++++++++++++++++++++ configs/kontron-sl-mx8mm_defconfig | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi index 8f90eb02550..f651b093d49 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-som.dtsi @@ -70,6 +70,27 @@ compatible = "mxicy,mx25r1635f", "jedec,spi-nor"; spi-max-frequency = <80000000>; reg = <0>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x1E0000>; + }; + + partition@1 { + label = "env"; + reg = <0x1E0000 0x10000>; + }; + + partition@2 { + label = "env_redundant"; + reg = <0x1F0000 0x10000>; + }; + }; }; }; diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index b67ab8668db..5c1dc754967 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x1f0000 +CONFIG_ENV_OFFSET=0x1E0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_IMX_CONFIG="board/kontron/sl-mx8mm/imximage.cfg" CONFIG_DM_GPIO=y @@ -19,6 +19,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_SPL=y +CONFIG_ENV_OFFSET_REDUND=0x1F0000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x42000000 @@ -72,6 +73,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y -- 2.37.1