From patchwork Wed Apr 26 13:25:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774123 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=T596E0re; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q60806dBkz23vM for ; Wed, 26 Apr 2023 23:29:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56456863AA; Wed, 26 Apr 2023 15:26:37 +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="T596E0re"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59A9D863C8; Wed, 26 Apr 2023 15:26:22 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 437928639F for ; Wed, 26 Apr 2023 15:26:18 +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=festevam@gmail.com Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6a6091ef0easo1591469a34.1 for ; Wed, 26 Apr 2023 06:26:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682515578; x=1685107578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xd77uYqLq18YvIZcfA9S8KljPP3EJKt/2ZyDm5x+ppY=; b=T596E0rei+vpbs71iPon2NbpwS6JrTss1yFpNGgyAtf+AXyYoXFeM8djw89Vkw0rJO aqvsnF0kyesZlKUW0YW0k6bMVTK7+ISRfl5ir6fDqKZsRuhb47cr3zJGwZ9WNzfts3UA /iuu7t8Uf36Y7ZWwgMyE7oeqsggdPcyBGYxldNnM4nQBPtliDMf35WwiyA6DbmdWTv7K VuHZvSTk23u9NHRyj6XFm7P/VRTBZ5k8027dsBM9EYNEYFDz6hehrCxRkFQd4bsxfPgb RTVvF8VAhgPdxMVSzlHDjnAadaE+8EMp9hKdccpVKVxzFATx5zoYvvVUXVWESr6kpGRK WTtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682515578; x=1685107578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xd77uYqLq18YvIZcfA9S8KljPP3EJKt/2ZyDm5x+ppY=; b=h3C+H01P+IyNZLjvxKf9Ry9R+H8Xp9N1kyZmgSwMkVcI7vJgCrrJpmJPsflVgdrfhm rzFKFHLy4JfpAfpPZHssbwBZq81O5p+qEZmTspHiz/Mc7YTPkc7kroAkO1GDoPe6W+Wd 2r3O71rWa9/xE1joThsUol5I6Njn8MD/QDLvZWpeLc9vqkU2M6xQSbg7ZQ6yT7H5NVv2 S/8sHdMwfPPuCMaWJ4OaF1c1xOuG1L4hbrlCJjroHudPmdMEaQxdh8Al/w5wSXuhkymI ItU++6lZqMzGr31VNni4lPw6PVECmfPNmgL6xzrvCudFcTuAnKroe3DoS6//0jOHsx8H 5QvA== X-Gm-Message-State: AAQBX9ere5ZyK9GGDk2bhpPM0DhQ24T4jYU4Azir5y8Yn4OZv8F2WM18 9B8UFr5hmy28/3ICqhdGBN0= X-Google-Smtp-Source: AKy350ZwqEHe8I/W6xxPK0O8317eT4CMNHL4uAncLEgdCitYQ6kwkBmm/OUlPJTtc/ga5qb26RXaUA== X-Received: by 2002:a05:6830:d17:b0:6a5:d659:4451 with SMTP id bu23-20020a0568300d1700b006a5d6594451mr12080549otb.1.1682515577651; Wed, 26 Apr 2023 06:26:17 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id h9-20020a056830164900b006a61bef7968sm6762384otr.53.2023.04.26.06.26.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 06:26:17 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam , Tom Rini Subject: [PATCH v4 14/14] smegw01: Convert CFG_EXTRA_ENV_SETTINGS to an env file Date: Wed, 26 Apr 2023 10:25:33 -0300 Message-Id: <20230426132533.1145591-14-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426132533.1145591-1-festevam@gmail.com> References: <20230426132533.1145591-1-festevam@gmail.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Currently, it is recommended to move from CFG_EXTRA_ENV_SETTINGS to an env file, so do the conversion. Suggested-by: Tom Rini Signed-off-by: Fabio Estevam --- Changes since v3: - New patch added as per Tom Rini's suggestion. Cc: Tom Rini board/storopack/smegw01/smegw01.env | 76 ++++++++++++++++++++++++++++ include/configs/smegw01.h | 77 ++++------------------------- 2 files changed, 85 insertions(+), 68 deletions(-) create mode 100644 board/storopack/smegw01/smegw01.env diff --git a/board/storopack/smegw01/smegw01.env b/board/storopack/smegw01/smegw01.env new file mode 100644 index 000000000000..d2e6b3cf64f6 --- /dev/null +++ b/board/storopack/smegw01/smegw01.env @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0+ + +altbootcmd= + echo Performing rollback...; + if test "${mmcpart_committed}" = 1; then + setenv mmcpart 2; + setenv mmcpart_committed 2; + else + setenv mmcpart 1; + setenv mmcpart_committed 1; + fi; + setenv bootcount 0; + setenv upgrade_available; + setenv ustate 3; + saveenv; + run bootcmd; +boot_emmc=setenv mmcdev_wanted 1; run persist_mmcdev; run bootcmd; +boot_sd=setenv mmcdev_wanted 0; run persist_mmcdev; run bootcmd; +bootcmd=run finduuid; run distro_bootcmd +bootdelay=2 +bootlimit=3 +bootm_size=0x10000000 +commit_mmc= + if test "${ustate}" = 1 -a "${mmcpart}" != "${mmcpart_committed}"; then + setenv mmcpart_committed ${mmcpart}; + saveenv; + fi; +console=ttymxc0 +fdt_addr=0x83000000 +fdtfile=imx7d-smegw01.dtb +fit_addr=0x88000000 +image=fitImage +loadaddr=0x80800000 +loadbootpart=mmc partconf 1 boot_part +loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image} +loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed} +mmcargs= + setenv bootargs console=${console},${baudrate} root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part} +mmcboot= + echo Booting...; + echo mmcdev: ${mmcdev}; + run commit_mmc; + echo mmcpart: ${mmcpart_committed}; + run loadpart; + echo gptpart: ${gpt_partition_entry}; + run loadbootpart; + if run loadimage; then + ; + else + run altbootcmd; + fi; + run mmcargs; + if bootm ${fit_addr}; then + ; + else + run altbootcmd; + fi; +mmcdev=1 +mmcpart=1 +mmcpart_committed=1 +persist_mmcdev= + if test "${mmcdev}" != "${mmcdev_wanted}"; then + setenv mmcdev "${mmcdev_wanted}"; + saveenv; + fi; +setup_boot_menu= + if test "${mmcdev}" = 1; then + setenv emmc_priority 0; + setenv sd_priority 1; + else + setenv emmc_priority 1; + setenv sd_priority 0; + fi; + setenv bootmenu_${emmc_priority} eMMC=run boot_emmc; + setenv bootmenu_${sd_priority} SD=run boot_sd; +SETUP_BOOT_MENU diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 6f373973ab84..d1c442577478 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -24,19 +24,17 @@ #ifdef CONFIG_SYS_BOOT_LOCKED #define EXTRA_ENV_FLAGS -#define SETUP_BOOT_MENU "setup_boot_menu=setenv bootmenu_0 eMMC=run bootcmd\0" +#define SETUP_BOOT_MENU setup_boot_menu=setenv bootmenu_0 eMMC=run bootcmd #else #define EXTRA_ENV_FLAGS "mmcdev:dw," -#define SETUP_BOOT_MENU "setup_boot_menu=" \ - "if test \"${mmcdev}\" = 1; then " \ - "setenv emmc_priority 0;" \ - "setenv sd_priority 1;" \ - "else " \ - "setenv emmc_priority 1;" \ - "setenv sd_priority 0;" \ - "fi;" \ - "setenv bootmenu_${emmc_priority} eMMC=run boot_emmc;" \ - "setenv bootmenu_${sd_priority} SD=run boot_sd;\0" +#define SETUP_BOOT_MENU setup_boot_menu= \ + if test "${mmcdev}" = 1; then \ + setenv emmc_priority 0; \ + setenv sd_priority 1; \ + else setenv emmc_priority 1; \ + setenv sd_priority 0; \ + fi; \ + setenv bootmenu_${emmc_priority} eMMC=run boot_emmc;setenv bootmenu_${sd_priority} SD=run boot_sd; #endif #define CFG_ENV_FLAGS_LIST_STATIC \ @@ -48,63 +46,6 @@ "upgrade_available:dw," \ EXTRA_ENV_FLAGS -#define CFG_EXTRA_ENV_SETTINGS \ - "image=fitImage\0" \ - "console=ttymxc0\0" \ - "fdtfile=imx7d-smegw01.dtb\0" \ - "fdt_addr=0x83000000\0" \ - "bootm_size=0x10000000\0" \ - "mmcdev=1\0" \ - "mmcpart=1\0" \ - "mmcpart_committed=1\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/mmcblk${mmcdev}p${gpt_partition_entry} rootwait rw " \ - __stringify(EXTRA_BOOTPARAMS) " SM_ROOT_DEV=${mmcdev} SM_ROOT_PART=${gpt_partition_entry} SM_BOOT_PART=${boot_part}\0" \ - "commit_mmc=if test \"${ustate}\" = 1 -a \"${mmcpart}\" != \"${mmcpart_committed}\"; then " \ - "setenv mmcpart_committed ${mmcpart};" \ - "saveenv;" \ - "fi;\0" \ - "bootlimit=3\0" \ - "fit_addr=0x88000000\0" \ - "loadimage=load mmc ${mmcdev}:${gpt_partition_entry} ${fit_addr} boot/${image}\0" \ - "loadpart=gpt setenv mmc ${mmcdev} rootfs-${mmcpart_committed}\0" \ - "loadbootpart=mmc partconf 1 boot_part\0" \ - "boot_sd=setenv mmcdev_wanted 0; run persist_mmcdev; run bootcmd;\0" \ - "boot_emmc=setenv mmcdev_wanted 1; run persist_mmcdev; run bootcmd;\0" \ - "persist_mmcdev=" \ - "if test \"${mmcdev}\" != \"${mmcdev_wanted}\"; then " \ - "setenv mmcdev \"${mmcdev_wanted}\";" \ - "saveenv;" \ - "fi;\0" \ - "mmcboot=echo Booting...; " \ - "echo mmcdev: ${mmcdev}; " \ - "run commit_mmc; " \ - "echo mmcpart: ${mmcpart_committed}; " \ - "run loadpart; " \ - "echo gptpart: ${gpt_partition_entry}; " \ - "run loadbootpart; " \ - "if run loadimage; then " \ - "; " \ - "else " \ - "run altbootcmd; " \ - "fi; " \ - "run mmcargs; " \ - "if bootm ${fit_addr}; then " \ - "; " \ - "else " \ - "run altbootcmd; " \ - "fi;\0" \ - "altbootcmd=echo Performing rollback...; " \ - "if test \"${mmcpart_committed}\" = 1; then " \ - "setenv mmcpart 2; " \ - "setenv mmcpart_committed 2;" \ - "else " \ - "setenv mmcpart 1; " \ - "setenv mmcpart_committed 1;" \ - "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ - "run bootcmd;\0" \ - SETUP_BOOT_MENU - /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR