diff mbox series

board: ti: am62x: am62x: Include K3 common .env files

Message ID 20230320172356.180467-1-n-jain1@ti.com
State Accepted
Commit 36bc171a6856179b81633e10700d99910cf1925b
Delegated to: Tom Rini
Headers show
Series board: ti: am62x: am62x: Include K3 common .env files | expand

Commit Message

Nikhil Jain March 20, 2023, 5:23 p.m. UTC 
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>
---
 board/ti/am62x/am62x.env | 74 ++--------------------------------------
 1 file changed, 2 insertions(+), 72 deletions(-)

Comments

Tom Rini March 20, 2023, 9:50 p.m. UTC | #1 
rn Mon, Mar 20, 2023 at 10:53:56PM +0530, Nikhil M Jain wrote:

> 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>
Tom Rini March 30, 2023, 1:54 a.m. UTC | #2 
On Mon, Mar 20, 2023 at 10:53:56PM +0530, Nikhil M Jain wrote:

> 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>

Applied to u-boot/next, thanks!
diff mbox series

Patch

diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
index c9a3b3dfae..e4e64fa637 100644
--- a/board/ti/am62x/am62x.env
+++ b/board/ti/am62x/am62x.env
@@ -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=