[PATCH V2 4/4] configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV and remove overlayaddr

Nishanth Menon
2020-10-08T02:48:01Z

Use DEFAULT_LINUX_BOOT_ENV to define the standard addresses used in rest
of TI platforms as defined in ti_armv7_common.h

This avoids the standard pitfalls we've had with kernel images and fdt
addresses stomping on each other.

As part of this process, redefine overlayaddr to be dtboaddr (defined
in ti_armv7_common.h for this very purpose) and get rid of the
definition of overlayaddr..

Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since V1:
- Squashed patch of #1 and #4, no functional changes

V1:
https://patchwork.ozlabs.org/project/uboot/patch/20201006190507.13346-2-nm at ti.com/
https://patchwork.ozlabs.org/project/uboot/patch/20201006190507.13346-5-nm at ti.com/

include/configs/am65x_evm.h | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index df0605657aef..9eed0ea203a9 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -69,9 +69,6 @@
"findfdt=" \
"setenv name_fdt k3-am654-base-board.dtb;" \
"setenv fdtfile ${name_fdt}\0" \
- "loadaddr=0x80080000\0" \
- "fdtaddr=0x82000000\0" \
- "overlayaddr=0x83000000\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
"stdin=serial,usbkbd\0" \
@@ -93,8 +90,8 @@
"fdt resize 0x100000;" \
"for overlay in $name_overlays;" \
"do;" \
- "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay};" \
- "fdt apply ${overlayaddr};" \
+ "load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay};" \
+ "fdt apply ${dtboaddr};" \
"done;\0" \
"get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
"${bootdir}/${name_kern}\0" \
@@ -133,6 +130,7 @@

/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
+ DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
DEFAULT_FIT_TI_ARGS \
EXTRA_ENV_AM65X_BOARD_SETTINGS \
--
2.28.0