* [PATCH V2 1/4] configs: j721e_evm: Use DEFAULT_LINUX_BOOT_ENV
2020-10-08 2:47 [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
@ 2020-10-08 2:47 ` Nishanth Menon
2020-10-08 2:47 ` [PATCH V2 2/4] env: ti: ufs: Use dtboaddr instead of overlayaddr Nishanth Menon
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2020-10-08 2:47 UTC (permalink / raw)
To: u-boot
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).. we will get rid of
overlayaddr later in the series.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since V1:
- reordered to be patch #1, no functional changes
V1: https://patchwork.ozlabs.org/project/uboot/patch/20201006190507.13346-3-nm at ti.com/
include/configs/j721e_evm.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 1b47e18b2f95..820e51378260 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -69,9 +69,7 @@
"findfdt=" \
"setenv name_fdt ${default_device_tree};" \
"setenv fdtfile ${name_fdt}\0" \
- "loadaddr=0x80080000\0" \
- "fdtaddr=0x82000000\0" \
- "overlayaddr=0x83000000\0" \
+ "overlayaddr=${dtboaddr}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \
@@ -114,8 +112,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" \
"partitions=" PARTS_DEFAULT \
"get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
@@ -165,6 +163,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_J721E_BOARD_SETTINGS \
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 2/4] env: ti: ufs: Use dtboaddr instead of overlayaddr
2020-10-08 2:47 [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
2020-10-08 2:47 ` [PATCH V2 1/4] configs: j721e_evm: " Nishanth Menon
@ 2020-10-08 2:47 ` Nishanth Menon
2020-10-08 2:48 ` [PATCH V2 3/4] configs: j721e_evm: Get rid " Nishanth Menon
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2020-10-08 2:47 UTC (permalink / raw)
To: u-boot
Use dtboaddr to define the overlay address common to all TI platforms
instead of creating a new overlayaddr for the purpose.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since V1:
- reordered to be patch #2, no functional changes
V1: https://patchwork.ozlabs.org/project/uboot/patch/20201006190507.13346-4-nm at ti.com/
include/environment/ti/ufs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/environment/ti/ufs.h b/include/environment/ti/ufs.h
index d457e2030814..6619ec9c88ed 100644
--- a/include/environment/ti/ufs.h
+++ b/include/environment/ti/ufs.h
@@ -26,8 +26,8 @@
"fdt resize 0x100000;" \
"for overlay in $name_overlays;" \
"do;" \
- "load scsi ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \
- "fdt apply ${overlayaddr};" \
+ "load scsi ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
+ "fdt apply ${dtboaddr};" \
"done;\0"
#endif
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 3/4] configs: j721e_evm: Get rid of overlayaddr
2020-10-08 2:47 [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
2020-10-08 2:47 ` [PATCH V2 1/4] configs: j721e_evm: " Nishanth Menon
2020-10-08 2:47 ` [PATCH V2 2/4] env: ti: ufs: Use dtboaddr instead of overlayaddr Nishanth Menon
@ 2020-10-08 2:48 ` Nishanth Menon
2020-10-08 2:48 ` [PATCH V2 4/4] configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV and remove overlayaddr Nishanth Menon
2020-10-12 9:09 ` [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Lokesh Vutla
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2020-10-08 2:48 UTC (permalink / raw)
To: u-boot
Now that we dont have any further users of overlayaddr, get rid of it.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
Changes since V1:
- reordered to be patch #3, no functional changes
V1: https://patchwork.ozlabs.org/project/uboot/patch/20201006190507.13346-6-nm at ti.com/
include/configs/j721e_evm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h
index 820e51378260..b707fc4e899f 100644
--- a/include/configs/j721e_evm.h
+++ b/include/configs/j721e_evm.h
@@ -69,7 +69,6 @@
"findfdt=" \
"setenv name_fdt ${default_device_tree};" \
"setenv fdtfile ${name_fdt}\0" \
- "overlayaddr=${dtboaddr}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 4/4] configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV and remove overlayaddr
2020-10-08 2:47 [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
` (2 preceding siblings ...)
2020-10-08 2:48 ` [PATCH V2 3/4] configs: j721e_evm: Get rid " Nishanth Menon
@ 2020-10-08 2:48 ` Nishanth Menon
2020-10-12 9:09 ` [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Lokesh Vutla
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2020-10-08 2:48 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV
2020-10-08 2:47 [PATCH V2 0/4] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
` (3 preceding siblings ...)
2020-10-08 2:48 ` [PATCH V2 4/4] configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV and remove overlayaddr Nishanth Menon
@ 2020-10-12 9:09 ` Lokesh Vutla
4 siblings, 0 replies; 6+ messages in thread
From: Lokesh Vutla @ 2020-10-12 9:09 UTC (permalink / raw)
To: u-boot
On 08/10/20 8:17 am, Nishanth Menon wrote:
> Use the common defaults from ./include/configs/ti_armv7_common.h
>
> This saves us from rediscovering the same painful lessons learnt from
> ARMv7 (kernel dtbs ramdisks overlays stomping on each other etc..)
>
> Changes since v1:
> - Squashed up am654 config patch to reduce the patch count down without
> loosing bisectability.
> - Reordered to remove the j721e dependencies ahead of am654
>
> V1: https://patchwork.ozlabs.org/project/uboot/list/?series=206321
Applied to u-boot-ti.
Thanks and regards,
Lokesh
^ permalink raw reply [flat|nested] 6+ messages in thread