* [PATCH] board: ti: am62x: am62x: Include K3 common .env files
@ 2023-03-20 17:23 Nikhil M Jain
2023-03-20 21:50 ` Tom Rini
2023-03-30 1:54 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Nikhil M Jain @ 2023-03-20 17:23 UTC (permalink / raw)
To: u-boot, trini, n-francis; +Cc: vigneshr, devarsht, Nikhil M Jain
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(-)
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=
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] board: ti: am62x: am62x: Include K3 common .env files
2023-03-20 17:23 [PATCH] board: ti: am62x: am62x: Include K3 common .env files Nikhil M Jain
@ 2023-03-20 21:50 ` Tom Rini
2023-03-30 1:54 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2023-03-20 21:50 UTC (permalink / raw)
To: Nikhil M Jain; +Cc: u-boot, n-francis, vigneshr, devarsht
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] board: ti: am62x: am62x: Include K3 common .env files
2023-03-20 17:23 [PATCH] board: ti: am62x: am62x: Include K3 common .env files Nikhil M Jain
2023-03-20 21:50 ` Tom Rini
@ 2023-03-30 1:54 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2023-03-30 1:54 UTC (permalink / raw)
To: Nikhil M Jain; +Cc: u-boot, n-francis, vigneshr, devarsht
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
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!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-30 1:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-20 17:23 [PATCH] board: ti: am62x: am62x: Include K3 common .env files Nikhil M Jain
2023-03-20 21:50 ` Tom Rini
2023-03-30 1:54 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox