* [PATCH v2 0/1] Use .env file for environment variables
@ 2023-01-24 5:16 Nikhil M Jain
2023-01-24 5:16 ` [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x Nikhil M Jain
0 siblings, 1 reply; 4+ messages in thread
From: Nikhil M Jain @ 2023-01-24 5:16 UTC (permalink / raw)
To: n-jain1; +Cc: trini, u-boot, vigneshr
Add .env file for setting up environment variable
fot AM62x.
Nikhil M Jain (1):
include: configs: am62x_evm: Add .env file for Am62x
board/ti/am62x/am62x.env | 103 ++++++++++++++++++++++++++++++++++++
include/configs/am62x_evm.h | 43 ---------------
2 files changed, 103 insertions(+), 43 deletions(-)
create mode 100644 board/ti/am62x/am62x.env
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x
2023-01-24 5:16 [PATCH v2 0/1] Use .env file for environment variables Nikhil M Jain
@ 2023-01-24 5:16 ` Nikhil M Jain
2023-01-24 15:50 ` Tom Rini
2023-02-07 16:50 ` Tom Rini
0 siblings, 2 replies; 4+ messages in thread
From: Nikhil M Jain @ 2023-01-24 5:16 UTC (permalink / raw)
To: n-jain1; +Cc: trini, u-boot, vigneshr
Use .env file for setting board related environment variables,
in place of am62x_evm.h file. Except for BOOTENV settings, as
config_distro_boot.env file doesn't exist.
Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
---
board/ti/am62x/am62x.env | 103 ++++++++++++++++++++++++++++++++++++
include/configs/am62x_evm.h | 43 ---------------
2 files changed, 103 insertions(+), 43 deletions(-)
create mode 100644 board/ti/am62x/am62x.env
diff --git a/board/ti/am62x/am62x.env b/board/ti/am62x/am62x.env
new file mode 100644
index 0000000000..e465d0010b
--- /dev/null
+++ b/board/ti/am62x/am62x.env
@@ -0,0 +1,103 @@
+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;
+
+default_device_tree=k3-am625-sk.dtb
+findfdt=
+ setenv name_fdt ${default_device_tree};
+ setenv fdtfile ${name_fdt}
+name_kern=Image
+console=ttyS2,115200n8
+args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000
+ ${mtdparts}
+run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
+
+boot=mmc
+mmcdev=1
+bootpart=1:2
+bootdir=/boot
+rd_spec=-
+init_mmc=run args_all args_mmc
+get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}
+get_overlay_mmc=
+ fdt address ${fdtaddr};
+ fdt resize 0x100000;
+ for overlay in $name_overlays;
+ do;
+ load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} &&
+ fdt apply ${dtboaddr};
+ done;
+get_kern_mmc=load mmc ${bootpart} ${loadaddr}
+ ${bootdir}/${name_kern}
+get_fit_mmc=load mmc ${bootpart} ${addr_fit}
+ ${bootdir}/${name_fit}
+partitions=name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}
diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h
index 7fbefdece4..7bf07809b0 100644
--- a/include/configs/am62x_evm.h
+++ b/include/configs/am62x_evm.h
@@ -38,51 +38,8 @@
DISTRO_BOOT_DEV_PXE(func) \
DISTRO_BOOT_DEV_DHCP(func)
-#define PARTS_DEFAULT \
- /* Linux partitions */ \
- "name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0"
-
-/* U-Boot general configuration */
-#define EXTRA_ENV_AM625_BOARD_SETTINGS \
- "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
- "findfdt=" \
- "setenv name_fdt ${default_device_tree};" \
- "setenv fdtfile ${name_fdt}\0" \
- "name_kern=Image\0" \
- "console=ttyS2,115200n8\0" \
- "args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000 " \
- "${mtdparts}\0" \
- "run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
-
-/* U-Boot MMC-specific configuration */
-#define EXTRA_ENV_AM625_BOARD_SETTINGS_MMC \
- "boot=mmc\0" \
- "mmcdev=1\0" \
- "bootpart=1:2\0" \
- "bootdir=/boot\0" \
- "rd_spec=-\0" \
- "init_mmc=run args_all args_mmc\0" \
- "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
- "get_overlay_mmc=" \
- "fdt address ${fdtaddr};" \
- "fdt resize 0x100000;" \
- "for overlay in $name_overlays;" \
- "do;" \
- "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
- "fdt apply ${dtboaddr};" \
- "done;\0" \
- "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
- "${bootdir}/${name_kern}\0" \
- "get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
- "${bootdir}/${name_fit}\0" \
- "partitions=" PARTS_DEFAULT
-
/* Incorporate settings into the U-Boot environment */
#define CFG_EXTRA_ENV_SETTINGS \
- DEFAULT_LINUX_BOOT_ENV \
- DEFAULT_MMC_TI_ARGS \
- EXTRA_ENV_AM625_BOARD_SETTINGS \
- EXTRA_ENV_AM625_BOARD_SETTINGS_MMC \
BOOTENV
/* Now for the remaining common defines */
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x
2023-01-24 5:16 ` [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x Nikhil M Jain
@ 2023-01-24 15:50 ` Tom Rini
2023-02-07 16:50 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2023-01-24 15:50 UTC (permalink / raw)
To: Nikhil M Jain; +Cc: u-boot, vigneshr
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
On Tue, Jan 24, 2023 at 10:46:02AM +0530, Nikhil M Jain wrote:
> Use .env file for setting board related environment variables,
> in place of am62x_evm.h file. Except for BOOTENV settings, as
> config_distro_boot.env file doesn't exist.
>
> 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] 4+ messages in thread
* Re: [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x
2023-01-24 5:16 ` [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x Nikhil M Jain
2023-01-24 15:50 ` Tom Rini
@ 2023-02-07 16:50 ` Tom Rini
1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2023-02-07 16:50 UTC (permalink / raw)
To: Nikhil M Jain; +Cc: u-boot, vigneshr
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
On Tue, Jan 24, 2023 at 10:46:02AM +0530, Nikhil M Jain wrote:
> Use .env file for setting board related environment variables,
> in place of am62x_evm.h file. Except for BOOTENV settings, as
> config_distro_boot.env file doesn't exist.
>
> Signed-off-by: Nikhil M Jain <n-jain1@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-07 16:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-24 5:16 [PATCH v2 0/1] Use .env file for environment variables Nikhil M Jain
2023-01-24 5:16 ` [PATCH v2 1/1] include: configs: am62x_evm: Add .env file for Am62x Nikhil M Jain
2023-01-24 15:50 ` Tom Rini
2023-02-07 16:50 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.