]> git.baikalelectronics.ru Git - uboot.git/commitdiff
board: ti: am62x: am62x: Include K3 common .env files
authorNikhil M Jain <n-jain1@ti.com>
Mon, 20 Mar 2023 17:23:56 +0000 (22:53 +0530)
committerTom Rini <trini@konsulko.com>
Wed, 29 Mar 2023 17:30:29 +0000 (13:30 -0400)
Include ti_armv7_common.env and ti/mmc.env, which includes' K3  common
environment variables used across different K3 boards.

This patch depends on
https://lore.kernel.org/all/20230315052745.110502-1-n-francis@ti.com/

Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
board/ti/am62x/am62x.env

index c9a3b3dfae62a10988b69bb4c6517660d03cbbb2..e4e64fa637175888df7b6179f65e608b60d50248 100644 (file)
@@ -1,75 +1,5 @@
-loadaddr=0x82000000
-kernel_addr_r=0x82000000
-fdtaddr=0x88000000
-dtboaddr=0x89000000
-fdt_addr_r=0x88000000
-fdtoverlay_addr_r=0x89000000
-rdaddr=0x88080000
-ramdisk_addr_r=0x88080000
-scriptaddr=0x80000000
-pxefile_addr_r=0x80100000
-bootm_size=0x10000000
-boot_fdt=try
-
-mmcrootfstype=ext4 rootwait
-finduuid=part uuid ${boot} ${bootpart} uuid
-args_mmc=run finduuid;setenv bootargs console=${console}
-       ${optargs}
-       root=PARTUUID=${uuid} rw
-       rootfstype=${mmcrootfstype}
-loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr
-bootscript=echo Running bootscript from mmc${mmcdev} ...;
-       source ${loadaddr}
-bootenvfile=uEnv.txt
-importbootenv=echo Importing environment from mmc${mmcdev} ...;
-       env import -t ${loadaddr} ${filesize}
-loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}
-loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}
-loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}
-envboot=mmc dev ${mmcdev};
-       if mmc rescan; then
-               echo SD/MMC found on device ${mmcdev};
-               if run loadbootscript; then
-                       run bootscript;
-               else
-                       if run loadbootenv; then
-                               echo Loaded env from ${bootenvfile};
-                               run importbootenv;
-                       fi;
-                       if test -n $uenvcmd; then
-                               echo Running uenvcmd ...;
-                               run uenvcmd;
-                       fi;
-               fi;
-       fi;
-mmcloados=
-       if test ${boot_fdt} = yes || test ${boot_fdt} = try; then
-               if run loadfdt; then
-                       bootz ${loadaddr} - ${fdtaddr};
-               else
-                       if test ${boot_fdt} = try; then
-                               bootz;
-                       else
-                               echo WARN: Cannot load the DT;
-                       fi;
-               fi;
-       else
-               bootz;
-       fi;
-mmcboot=mmc dev ${mmcdev};
-       devnum=${mmcdev};
-       devtype=mmc;
-       if mmc rescan; then
-               echo SD/MMC found on device ${mmcdev};
-               if run loadimage; then
-                       run args_mmc;
-                       if test ${boot_fit} -eq 1; then
-                               run run_fit;
-                       else
-                               run mmcloados;
-                       fi;
-               fi;
-       fi;
+#include <environment/ti/ti_armv7_common.env>
+#include <environment/ti/mmc.env>
 
 default_device_tree=k3-am625-sk.dtb
 findfdt=