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 9EC4BC3DA4B for ; Wed, 17 Jul 2024 05:12:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A44C688A1B; Wed, 17 Jul 2024 07:12:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de 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" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="joQPxx3r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DAC2888A26; Wed, 17 Jul 2024 07:12:02 +0200 (CEST) Received: from mickerik.phytec.de (mickerik.phytec.de [91.26.50.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DC88E885B6 for ; Wed, 17 Jul 2024 07:12:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=D.Schultz@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1721193120; x=1723785120; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=rlPxh/6PGLfMMHrbT0iYuTZze9ab4ReMP5HvQtU0V6Q=; b=joQPxx3ravUa4kgC3Uy6RjfdSxnCc8NVtxs9kb5frpAehgVEzCKwTtLNx6tDgPKO 7K6sfo9YvoZiz6OKAjwsgV2SGeAZGeFRG0f2tgXoZBDEohK7LD+WW9oB1UjDNUOt gr0sWS+RS9x7hI2DuOCGRb/zibAvxJxybBR1iup9hpw=; X-AuditID: ac14000a-03251700000021bc-ec-669752a0f866 Received: from berlix.phytec.de (Unknown_Domain [172.25.0.12]) (using TLS with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 01.8B.08636.0A257966; Wed, 17 Jul 2024 07:12:00 +0200 (CEST) Received: from ls-radium.phytec (172.25.0.11) by Berlix.phytec.de (172.25.0.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.6; Wed, 17 Jul 2024 07:11:58 +0200 From: Daniel Schultz To: , , CC: , , , Benjamin Hahn , Daniel Schultz Subject: [PATCH v2 4/9] board: phytec: renaming of variables according to bootstd doc Date: Tue, 16 Jul 2024 22:11:29 -0700 Message-ID: <20240717051134.1538180-5-d.schultz@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240717051134.1538180-1-d.schultz@phytec.de> References: <20240717051134.1538180-1-d.schultz@phytec.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.25.0.11] X-ClientProxiedBy: Berlix.phytec.de (172.25.0.12) To Berlix.phytec.de (172.25.0.12) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHLMWRmVeSWpSXmKPExsWyRpKBR3dB0PQ0gw0X1S1a1npYTJ20md3i 7d5Odovud+oOLB6vDqxi9zh7ZwejR393C6vH8RvbmQJYorhsUlJzMstSi/TtErgypr+5xlqw QLHib+cB9gbGb9JdjJwcEgImEi+u3WDtYuTiEBJYwiTR+eMlG4Rzn1Fi+7fLrCBVbAJaEne2 zGUGsUUEfCSOtm5mASliFuhklFi/bwETSEJYIFTi0+ddYA0sAqoSj5ovsIDYvAJWEtP2nGGE WCcvMfPSd3YQm1PAWmLxxdtANgfQNiuJww8CIcoFJU7OfALWygxU3rx1NjOELSFx8MULMFtI QEFi9rbJcCOnnXvNDGGHSmz9sp1pAqPQLCSjZiEZNQvJqAWMzKsYhXIzk7NTizKz9QoyKktS k/VSUjcxgsJchIFrB2PfHI9DjEwcjIcYJTiYlUR4JzBOSxPiTUmsrEotyo8vKs1JLT7EKM3B oiTOu7ojOFVIID2xJDU7NbUgtQgmy8TBKdXAOLFI5t1uq9hDZt6hbM2f7be88bNkb03/rFip /dOSOWrS6hn1axZXFV6f+aVlgtSD/M8q19g6pXvudeXUOqs0emxj21708qKO6JTTnWIzw7mv zXQ2W9jOfzCBz+zWhqvWfi4fHv7IeBt7MbW2Iml/XHwjg4O1yhmzzwyH9Rkrjh53vls258wR JZbijERDLeai4kQAlNkXJWECAAA= 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: Benjamin Hahn Rename existing environment variables according to the bootstd doc. Renamed variables are fdto_addr, bootenv_addr, fdt_addr and fdt_file. Signed-off-by: Benjamin Hahn Signed-off-by: Daniel Schultz Reviewed-by: Wadim Egorov --- .../phytec/phycore_imx8mp/phycore_imx8mp.env | 20 +++++++++---------- board/phytec/phycore_imx93/phycore_imx93.env | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env index 4ed5dc7e272..f8f878e8f3a 100644 --- a/board/phytec/phycore_imx8mp/phycore_imx8mp.env +++ b/board/phytec/phycore_imx8mp/phycore_imx8mp.env @@ -17,17 +17,17 @@ bootcmd= fi; fi; console=ttymxc0,115200 -bootenv_addr=0x49100000 -fdto_addr=0x49000000 +bootenv_addr_r=0x49100000 +fdtoverlay_addr_r=0x49000000 dofastboot=0 emmc_dev=2 fastboot_raw_partition_all=0 4194304 fastboot_raw_partition_bootloader=64 8128 -fdt_addr=0x48000000 -fdt_file=CONFIG_DEFAULT_FDT_FILE +fdt_addr_r=0x48000000 +fdtfile=CONFIG_DEFAULT_FDT_FILE image=Image ip_dyn=yes -loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file} +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} mmcargs= setenv bootargs console=${console} @@ -37,13 +37,13 @@ mmcboot= echo Booting from mmc ...; if test ${no_bootenv} = 0; then if run mmc_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; fi; run mmcargs; if run loadfdt; then run mmc_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; @@ -62,14 +62,14 @@ netboot= fi; if test ${no_bootenv} = 0; then if run net_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; fi; ${get_cmd} ${loadaddr} ${image}; run netargs; - if ${get_cmd} ${fdt_addr} ${fdt_file}; then + if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then run net_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; diff --git a/board/phytec/phycore_imx93/phycore_imx93.env b/board/phytec/phycore_imx93/phycore_imx93.env index 09542f5aa7d..ab65cfce5fd 100644 --- a/board/phytec/phycore_imx93/phycore_imx93.env +++ b/board/phytec/phycore_imx93/phycore_imx93.env @@ -4,10 +4,10 @@ image=Image console=ttyLP0 -fdt_addr=0x83000000 -fdto_addr=0x830c0000 -bootenv_addr=0x83500000 -fdt_file=CONFIG_DEFAULT_FDT_FILE +fdt_addr_r=0x83000000 +fdtoverlay_addr_r=0x830c0000 +bootenv_addr_r=0x83500000 +fdtfile=CONFIG_DEFAULT_FDT_FILE ip_dyn=yes mmcdev=CONFIG_SYS_MMC_ENV_DEV mmcpart=1 @@ -16,16 +16,16 @@ mmcautodetect=yes mmcargs=setenv bootargs console=${console},${baudrate} earlycon root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} -loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file} +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} mmcboot= echo Booting from mmc ...; if run mmc_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; run mmcargs; if run loadfdt; then run mmc_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; @@ -41,12 +41,12 @@ netboot= setenv get_cmd tftp; fi; if run net_load_bootenv; then - env import -t ${bootenv_addr} ${filesize}; + env import -t ${bootenv_addr_r} ${filesize}; fi; ${get_cmd} ${loadaddr} ${image}; - if ${get_cmd} ${fdt_addr} ${fdt_file}; then + if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then run net_apply_overlays; - booti ${loadaddr} - ${fdt_addr}; + booti ${loadaddr} - ${fdt_addr_r}; else echo WARN: Cannot load the DT; fi; -- 2.25.1