board: phytec: renaming of variables according to bootstd doc

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 <B.Hahn@phytec.de>
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Reviewed-by: Wadim Egorov <w.egorov@phytec.de>

diff --git a/board/phytec/phycore_imx8mp/phycore_imx8mp.env b/board/phytec/phycore_imx8mp/phycore_imx8mp.env
index 4ed5dc7e272d160f1a9130d9b4e55a8fddca4b35..f8f878e8f3a680b4cdf726fc840642a3d09ed5d4 100644 (file)
--- 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 09542f5aa7de26af7f375a4fc57727a23be22b4f..ab65cfce5fd11f66297ae795e6a47ea9209707db 100644 (file)
--- 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;