From patchwork Tue Mar 30 10:09:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1459979 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=0Sd5wClK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F8lZK0bTGz9sVt for ; Tue, 30 Mar 2021 21:10:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BA702828E1; Tue, 30 Mar 2021 12:10:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="0Sd5wClK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B7C1E828FE; Tue, 30 Mar 2021 12:10:10 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 32006828A4 for ; Tue, 30 Mar 2021 12:10:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x634.google.com with SMTP id jy13so23995012ejc.2 for ; Tue, 30 Mar 2021 03:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xb9k9AQSVaS4990nIsI6BRiNCJzB6bFwCB1kt2YMRPQ=; b=0Sd5wClKmbyhF8cbQsaZMQTN5xY6jorB42umB8m5O/YkUz01GxyTYiB2VceFgAMh8F TfiUlbhIR7znEfYFLAAKY69ZHiskdpgB8VV5vdurVn6PPogqJX84f5Pkd0fjU5412bh2 rKMy1KNw4mJc4kvwwi1ptP/hcpVbr/SgEe5lDQiLE27yjakuKoZqlc6jexrb6kpMixxo luydeKZ3E1slzcmB/uixIIZdqwS8uO757q7/Syu5uTbCjCX3Fwv2T8mS2YcBE/a4Xrsz 4qIqHTSsni+piCjUewMpJ4MSzkYOhmv9uAwGf5dw4BFTDbFDGuCcbtN/sHwdDaFJ9Ik9 oWSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xb9k9AQSVaS4990nIsI6BRiNCJzB6bFwCB1kt2YMRPQ=; b=PQgzxpTTENeU17jC6Behnl0SrjJNQ9Uk+bvkSKPEh4Z4FedDj7vz73BYKN3pZEAHJc O/lpy7gbLWqslCTRilctu86wNCrXPNB/QXBlCDCnC/Mg7JIxM/9DzT6mkJkvfXnku8z2 NL7Bu5kKZTPgUJiEiRSbK96hQjzohtVnRgwlLOVno3mjR3z0OsqHg+iB6eCpPi64t49O sKpOEXILffwM+ZkwrguhiV5yumVekrQQeLGCGSslTwwpQUKS0P3hKmYGg2rwngzyTu2L kjpTR5k7IE/AfBjTuvuOKpJruE+uBvrgaHDtz7qmEKHKF+vODqRS+PAcGarNrxQl9W3y mE7w== X-Gm-Message-State: AOAM533PznTGx+sGkCdhrQbqkTUe5J0w1MdN3q5BsvBh0MiL6w6p+g4Z SYVqtEQd+0hUvNPUUCCuIFMcM8+Ij/rTHLrF X-Google-Smtp-Source: ABdhPJy6vZerptU/eiiznW5R6ZrcCylPf/YZrFpAx+4g96oKWw6Li0CrCk59C7kfAUgV6LdZzEW1Ag== X-Received: by 2002:a17:906:14d0:: with SMTP id y16mr32887046ejc.242.1617099006723; Tue, 30 Mar 2021 03:10:06 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id g25sm10586788edp.95.2021.03.30.03.10.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Mar 2021 03:10:06 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Joe Hershberger , Wolfgang Denk Subject: [PATCH 1/4] env: Setup default value for ENV_OFFSET_REDUND Date: Tue, 30 Mar 2021 12:09:57 +0200 Message-Id: X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean This variable is used for pointing to location where redundant variables are located. There is no default value. And it doesn't need to be specified which is showing as warning when savedefconfig is called. make xilinx_zynqmp_virt_defconfig # # configuration written to .config # make savedefconfig scripts/kconfig/conf --savedefconfig=defconfig Kconfig .config:199:warning: symbol value '' invalid for ENV_OFFSET_REDUND Signed-off-by: Michal Simek --- env/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/env/Kconfig b/env/Kconfig index b473d7cfe1e9..bc4f7d8f4ee4 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -534,6 +534,7 @@ config ENV_OFFSET_REDUND hex "Redundant environment offset" depends on (ENV_IS_IN_EEPROM || ENV_IS_IN_MMC || ENV_IS_IN_NAND || \ ENV_IS_IN_SPI_FLASH) && SYS_REDUNDAND_ENVIRONMENT + default 0 help Offset from the start of the device (or partition) of the redundant environment location. From patchwork Tue Mar 30 10:09:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1459982 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=x0dBdBYy; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F8lZh4Wyvz9sVt for ; Tue, 30 Mar 2021 21:10:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E077582927; Tue, 30 Mar 2021 12:10:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="x0dBdBYy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 19D1982909; Tue, 30 Mar 2021 12:10:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) (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 B2885828BF for ; Tue, 30 Mar 2021 12:10:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x532.google.com with SMTP id bx7so17497587edb.12 for ; Tue, 30 Mar 2021 03:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZlhAvg/zRvVSxBejiBuODNYhXCzzxruCMQ/GiWmgEsU=; b=x0dBdBYyd9q4gntBB/ZEQ6HIUfn8s1W0KkSpnE73Fuwo7VD2+vje+OT5S3OgfwUVam xM5twAhvfzWCmggrHHJvNCtuck9feq3Ys/U7EhDb32ozaC7wfgb3vAYQuWirCX9gRCQU Cfz+Wapjy0TpFxE89Axr4uKoq92kiAgO9zuUXuWoBM4rtp3nE8/vfTIc7Xgca0YeMAkp iBKlQjODLt/iKn56OyHVBuryBqsLP3iCKGyDitEhjOeX8JQ6w1ayxf5QWr2pgEkhS3EX b6KLpaSOl430R01FzNIPoBL2es+L+qFMgEnCa+0E9exLjMwV/Jzda1yQQA3V3BdBk51X XSiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZlhAvg/zRvVSxBejiBuODNYhXCzzxruCMQ/GiWmgEsU=; b=icETcxcTZk6AUxpidnaxhVM+Vr31P0Cq/C/4cD82XJoU72O/Pvo4pBQl1HpFJhFRG1 /kv4jtO+smIqmYRufSM8neLS3oeRl8C4b2oBeM8RAWcpb48wLrcklj3/6ZrkFf5v4BQp 0INJG702Zl12EhaiugSJP/RBTs8+iZ6fAx8SKqiwZamVGZjBxoCbqjgMNVG9hlsaDU8e loLvzm+fkrLZATq39eWz8NqBSukDIO6Leoo7jXuPHo5fLYFr8xMFOOiA+OXkxIURETta 6Xi5js9otQMwwYzf4Nwn9nGPnWKRZ+oKbDOKWSNym3081KxNJJCOxcwh/NS/G7MO94YQ VGJA== X-Gm-Message-State: AOAM533zgf4vtgcrDuABHct5fE3dctBwOHbgvQej3ru7FF6T51HSeJtU mh8xKR/XVM3hLGhJCx8YNl3Ke61hylEsbc0i X-Google-Smtp-Source: ABdhPJwaTirBwjXCJrrECf57Hktne50py/GMIA+T4VbKA4mHurnnU0G1aHawBJ+aeYXuZfRssTgYFQ== X-Received: by 2002:aa7:dd98:: with SMTP id g24mr32832718edv.75.1617099008247; Tue, 30 Mar 2021 03:10:08 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id gj13sm9762904ejb.118.2021.03.30.03.10.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Mar 2021 03:10:07 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Ashok Reddy Soma , Michal Simek Subject: [PATCH 2/4] xilinx: zynq: Add support for saving env based on bootmode Date: Tue, 30 Mar 2021 12:09:58 +0200 Message-Id: <2ed7949ab32555af4464bce3eac276944ea82c44.1617098995.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean From: Ashok Reddy Soma Enable saving variables to MMC(FAT), NAND, SPI based on primary bootmode. If bootmode is JTAG, dont save env anywhere(NOWHERE). Since most of the flashes on zynq evaluation boards are 16MB in size, set default ENV_OFFSET to 15MB(0xE00000). Signed-off-by: Ashok Reddy Soma Signed-off-by: Michal Simek --- board/xilinx/zynq/board.c | 32 ++++++++++++++++++++++++++++++ configs/xilinx_zynq_virt_defconfig | 5 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 7533dddb9b65..e2e9b3f0f78c 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -119,3 +120,34 @@ int dram_init(void) return 0; } #endif + +enum env_location env_get_location(enum env_operation op, int prio) +{ + u32 bootmode = zynq_slcr_get_boot_mode() & ZYNQ_BM_MASK; + + if (prio) + return ENVL_UNKNOWN; + + switch (bootmode) { + case ZYNQ_BM_SD: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + return ENVL_UNKNOWN; + case ZYNQ_BM_NAND: + if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) + return ENVL_NAND; + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) + return ENVL_UBI; + return ENVL_UNKNOWN; + case ZYNQ_BM_NOR: + case ZYNQ_BM_QSPI: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + return ENVL_UNKNOWN; + case ZYNQ_BM_JTAG: + default: + return ENVL_NOWHERE; + } +} diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 2fe53182caa8..bdd6be2b9079 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 +CONFIG_ENV_OFFSET=0xE00000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_DM_GPIO=y CONFIG_SPL_STACK_R_ADDR=0x200000 @@ -55,7 +56,9 @@ CONFIG_CMD_MTDPARTS_SPREAD=y CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y CONFIG_CMD_UBI=y CONFIG_OF_LIST="zynq-zc702 zynq-zc706 zynq-zc770-xm010 zynq-zc770-xm011 zynq-zc770-xm011-x16 zynq-zc770-xm012 zynq-zc770-xm013 zynq-cc108 zynq-microzed zynq-minized zynq-picozed zynq-zed zynq-zturn zynq-zturn-v5 zynq-zybo zynq-zybo-z7 zynq-dlc20-rev1.0" -CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y From patchwork Tue Mar 30 10:09:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1459980 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=n9T/Zl4V; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F8lZV5pjpz9sVt for ; Tue, 30 Mar 2021 21:10:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1ECE58291A; Tue, 30 Mar 2021 12:10:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="n9T/Zl4V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E3C8F8290A; Tue, 30 Mar 2021 12:10:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 37E50828E1 for ; Tue, 30 Mar 2021 12:10:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62f.google.com with SMTP id l4so23938614ejc.10 for ; Tue, 30 Mar 2021 03:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pz7s4JfNNdbID1xxgB2sy0Dhqv7H+hd1wgG0m5mSA7U=; b=n9T/Zl4VT17WIoFLS9J7taYNUi5E/bl+XHkUUm0XBiSz7+GloT1/gR5FKm0MLn80oq mQULnCY2G2pcHDDceKFWzHVKykQXF5gH0ouGLiDjOaTIJIry1R/MuIgUQAkn9OPnnHGI 5/50xhx2nSnHKIPoRSvlxBk7RQq0xtfO5bPNGus6aHCTfOfmAMXM7RneziPwftnQJbLx GI3IHYHig6n/gDw6d2UlN57NhMoLckexzSxMlHYkaCPQ7ejx4VJ3DloImvLf/9E357OI J6egPTZAJxWGjg+ZdX6jDi0MC/WdfchukT3q8ArJV1VuGiTmJVbj4F5m/x9NOrRU0vfr AHyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Pz7s4JfNNdbID1xxgB2sy0Dhqv7H+hd1wgG0m5mSA7U=; b=Wifxeb7Bwp7RqV0DfET2w75Yxf7hbfrWHBOesOoo2WGqubi1dob5An4Ge2H3ZTfLuD 8e5PofiMAHXpVDqHPplSJ7oGOF2AwOlOGf3w89Akv28gsY8Z6H0t8uiKa723HqOJQTqZ OFZhhBzXfq0l2j+o1jKjsm9iCsIhgozvu6Ck+g+OJ0MC6hcZHwJ6bE5xXyUo2QzO7ern PnflWlhDyJ3cmlPx0jhcWOodkgcaSuA2xfS08w58THzEnGzMQJCJgE4/EEIH9pBHtYj2 be2HXcKEosyk5rIkzlnLM2miLvTKbCF8vKuJOsuE8IaBYFyAdDcIZjU3nCMSXG51ti6F HHuA== X-Gm-Message-State: AOAM533l1O1j6kVLIJCuxwlQHMKs2xjH08WIx+bAoh2WKY7YB2La59Y4 FEJPXMhRGh6wc98+iQbyqBVvrY+8QU5ejLCy X-Google-Smtp-Source: ABdhPJyljSgx0+z7PV4F1gV0uKiikdPu1HGrMWX4FJKuPj8JkPrJtArluy7ng09kEXMs8yI8wnYs/Q== X-Received: by 2002:a17:907:1749:: with SMTP id lf9mr20900458ejc.174.1617099009643; Tue, 30 Mar 2021 03:10:09 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id c12sm11408833edx.54.2021.03.30.03.10.09 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Mar 2021 03:10:09 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Ashok Reddy Soma , Joe Hershberger , Wolfgang Denk Subject: [PATCH 3/4] xilinx: versal: Add support for saving env based on bootmode Date: Tue, 30 Mar 2021 12:09:59 +0200 Message-Id: <9d1c895f235cad0a93911084fc0a9259d9aae5fe.1617098995.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean From: Ashok Reddy Soma Enable saving variables to MMC(FAT) and SPI based on primary bootmode. If bootmode is JTAG, dont save env anywhere(NOWHERE). Enable ENV_FAT_DEVICE_AND_PART="0:auto" for Versal platforms as well. Signed-off-by: Ashok Reddy Soma Signed-off-by: Michal Simek --- board/xilinx/versal/board.c | 30 ++++++++++++++++++++++++++++ configs/xilinx_versal_virt_defconfig | 3 +++ env/Kconfig | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index c644fe8dc068..042f3ec4f3a0 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -245,3 +246,32 @@ int dram_init(void) void reset_cpu(ulong addr) { } + +enum env_location env_get_location(enum env_operation op, int prio) +{ + u32 bootmode = versal_get_bootmode(); + + if (prio) + return ENVL_UNKNOWN; + + switch (bootmode) { + case EMMC_MODE: + case SD_MODE: + case SD1_LSHFT_MODE: + case SD_MODE1: + if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT)) + return ENVL_FAT; + if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) + return ENVL_EXT4; + return ENVL_UNKNOWN; + case OSPI_MODE: + case QSPI_MODE_24BIT: + case QSPI_MODE_32BIT: + if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) + return ENVL_SPI_FLASH; + return ENVL_UNKNOWN; + case JTAG_MODE: + default: + return ENVL_NOWHERE; + } +} diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 2d639a1026a8..fe108d3475c3 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -39,6 +39,9 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_CMD_UBI=y CONFIG_OF_BOARD=y +CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y diff --git a/env/Kconfig b/env/Kconfig index bc4f7d8f4ee4..0cee6a8e310f 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -431,7 +431,7 @@ config ENV_FAT_DEVICE_AND_PART string "Device and partition for where to store the environemt in FAT" depends on ENV_IS_IN_FAT default "0:1" if TI_COMMON_CMD_OPTIONS - default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP + default "0:auto" if ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL default "0:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1 default "1:auto" if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1 default "0" if ARCH_AT91 From patchwork Tue Mar 30 10:10:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1459983 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=h7cz4fx8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F8lZv5V7dz9sVt for ; Tue, 30 Mar 2021 21:11:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9715C8292B; Tue, 30 Mar 2021 12:10:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="h7cz4fx8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 70D76828E1; Tue, 30 Mar 2021 12:10:17 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 DCC23828E6 for ; Tue, 30 Mar 2021 12:10:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=xilinx.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ej1-x62e.google.com with SMTP id w3so23986033ejc.4 for ; Tue, 30 Mar 2021 03:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6p4tjQJwnAhJjOZBhEutvA4tle5JBP1y4OqxEivAOac=; b=h7cz4fx8a+p4TNyXlWftsENyifr7YNXc0sC0TnjLJQjezPnhCdhLXlxsIZASYdlp5k J5Q34hX//7WzVCYNgQdm52gcT8rbMzj+0H7261RNJ0U++v10RrhktilX4kx/RBwqnGZc oi/jyKjXEux8uIhmRmR55Xdq6/0lXznfdroJcVpe/SAkeoQfc0kEQ9hSJuh+q/kHmvKO v3xKWdmbQiDuBvkTL+Rd3hO11citIlmCe72dVLKDCaJ6U4UxojkzEn2GhzOKXMoAbheH vQUPW5BNkJT2Zqjre4HQ2Y3HLhC/gtp7ZEGM96oicvHtijSZx9KcGwPc7it948goPx34 6fKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6p4tjQJwnAhJjOZBhEutvA4tle5JBP1y4OqxEivAOac=; b=ica1zbucKZ0FHFqbcggotOQdL3fvD93htTYyyebFEkOVScxSc935D7azPWD2Cj6sPX FohFfwVxolAZBnXiM/CisN+Z0s8jqID2YetOzcz5LuqNefeJYWnQDSzD13AR+dMZlfsj XSU/ajeK8mU+LtkmfZHrl33VHADmdn+jO9go8BGtbZ4bSLlExoCmu1DkyL4nskvqB7cU Rdcg6jtk9HhTHgOEDYgh5p5bqQkwL1s3qyvszWoycgq3qeGoRJSefZY6WiWuDBWms6k1 TTF2ygXkATh/AXdQ5GJY/Zzka1gQKWCZVOu36j497mAzPYzjKMaAqVI1RimmqKzXE/Ox MhFg== X-Gm-Message-State: AOAM530WeFtLVzvJ5/3jlo6LETgyKrcvtmbQDo4KSUM4Q6jvdp3rBuuw 8ZvcbDEoNE/sqelqvtPqt8IbQfHrxgfGYe1o X-Google-Smtp-Source: ABdhPJwLK/9hMHTDecjBBpHTVXkrM26A5Air1YbD0J7YLciNKw3NXjs2Dz+tpdrvpMYOy6P692+fHw== X-Received: by 2002:a17:907:270d:: with SMTP id w13mr10183412ejk.340.1617099011133; Tue, 30 Mar 2021 03:10:11 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::45a]) by smtp.gmail.com with ESMTPSA id ho11sm9421429ejc.112.2021.03.30.03.10.10 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Mar 2021 03:10:10 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek Subject: [PATCH 4/4] xilinx: Enable redundant variable handling Date: Tue, 30 Mar 2021 12:10:00 +0200 Message-Id: <38d6c7a36a1f6c4fbeaedd20ee89dc1f58eed5c4.1617098995.git.michal.simek@xilinx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: References: MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean Enable this feature by default to be able to work with env import/export commands which are done in this slightly changed variable format (There is addtional flag fields in variable file which is changing CRC calculation). Signed-off-by: Michal Simek --- configs/microblaze-generic_defconfig | 1 + configs/xilinx_versal_virt_defconfig | 1 + configs/xilinx_zynq_virt_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 761cc65cbfab..245763b40877 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_JFFS2=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_SPL_DM=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index fe108d3475c3..da3d2c2a936f 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -42,6 +42,7 @@ CONFIG_OF_BOARD=y CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index bdd6be2b9079..3892a71eac8b 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -60,6 +60,7 @@ CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index ac45df813268..6eb566e30df0 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -74,6 +74,7 @@ CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y