* [PATCH 1/5] configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
@ 2020-10-06 19:05 ` Nishanth Menon
2020-10-06 19:05 ` [PATCH 2/5] configs: j721e_evm: " Nishanth Menon
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-06 19:05 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>
---
include/configs/am65x_evm.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index df0605657aef..19dc1a537e6a 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -69,9 +69,7 @@
"findfdt=" \
"setenv name_fdt k3-am654-base-board.dtb;" \
"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" \
"stdin=serial,usbkbd\0" \
@@ -93,8 +91,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 +131,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] 9+ messages in thread* [PATCH 2/5] configs: j721e_evm: Use DEFAULT_LINUX_BOOT_ENV
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
2020-10-06 19:05 ` [PATCH 1/5] configs: am65x_evm: " Nishanth Menon
@ 2020-10-06 19:05 ` Nishanth Menon
2020-10-06 19:05 ` [PATCH 3/5] env: ti: ufs: Use dtboaddr instead of overlayaddr Nishanth Menon
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-06 19:05 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>
---
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] 9+ messages in thread* [PATCH 3/5] env: ti: ufs: Use dtboaddr instead of overlayaddr
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
2020-10-06 19:05 ` [PATCH 1/5] configs: am65x_evm: " Nishanth Menon
2020-10-06 19:05 ` [PATCH 2/5] configs: j721e_evm: " Nishanth Menon
@ 2020-10-06 19:05 ` Nishanth Menon
2020-10-06 19:05 ` [PATCH 4/5] configs: am65x_evm: Get rid " Nishanth Menon
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-06 19:05 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>
---
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] 9+ messages in thread* [PATCH 4/5] configs: am65x_evm: Get rid of overlayaddr
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
` (2 preceding siblings ...)
2020-10-06 19:05 ` [PATCH 3/5] env: ti: ufs: Use dtboaddr instead of overlayaddr Nishanth Menon
@ 2020-10-06 19:05 ` Nishanth Menon
2020-10-06 19:05 ` [PATCH 5/5] configs: j721e_evm: " Nishanth Menon
2020-10-07 5:45 ` [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Lokesh Vutla
5 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-06 19:05 UTC (permalink / raw)
To: u-boot
Now that we are all clear of users of overlayaddr, get rid of it.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
include/configs/am65x_evm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 19dc1a537e6a..9eed0ea203a9 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -69,7 +69,6 @@
"findfdt=" \
"setenv name_fdt k3-am654-base-board.dtb;" \
"setenv fdtfile ${name_fdt}\0" \
- "overlayaddr=${dtboaddr}\0" \
"name_kern=Image\0" \
"console=ttyS2,115200n8\0" \
"stdin=serial,usbkbd\0" \
--
2.28.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] configs: j721e_evm: Get rid of overlayaddr
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
` (3 preceding siblings ...)
2020-10-06 19:05 ` [PATCH 4/5] configs: am65x_evm: Get rid " Nishanth Menon
@ 2020-10-06 19:05 ` Nishanth Menon
2020-10-07 5:45 ` [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Lokesh Vutla
5 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-06 19:05 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>
---
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] 9+ messages in thread* [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV
2020-10-06 19:05 [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Nishanth Menon
` (4 preceding siblings ...)
2020-10-06 19:05 ` [PATCH 5/5] configs: j721e_evm: " Nishanth Menon
@ 2020-10-07 5:45 ` Lokesh Vutla
2020-10-07 12:11 ` Nishanth Menon
5 siblings, 1 reply; 9+ messages in thread
From: Lokesh Vutla @ 2020-10-07 5:45 UTC (permalink / raw)
To: u-boot
On 07/10/20 12:35 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..)
If PATCH 3 is made as PATCH 1, then existing PATCH (1&4) and PATCH (2&5) can be
combined.
Thanks and regards,
Lokesh
>
>
> Nishanth Menon (5):
> configs: am65x_evm: Use DEFAULT_LINUX_BOOT_ENV
> configs: j721e_evm: Use DEFAULT_LINUX_BOOT_ENV
> env: ti: ufs: Use dtboaddr instead of overlayaddr
> configs: am65x_evm: Get rid of overlayaddr
> configs: j721e_evm: Get rid of overlayaddr
>
> include/configs/am65x_evm.h | 8 +++-----
> include/configs/j721e_evm.h | 8 +++-----
> include/environment/ti/ufs.h | 4 ++--
> 3 files changed, 8 insertions(+), 12 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV
2020-10-07 5:45 ` [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV Lokesh Vutla
@ 2020-10-07 12:11 ` Nishanth Menon
2020-10-08 2:51 ` Nishanth Menon
0 siblings, 1 reply; 9+ messages in thread
From: Nishanth Menon @ 2020-10-07 12:11 UTC (permalink / raw)
To: u-boot
On 11:15-20201007, Lokesh Vutla wrote:
>
>
> On 07/10/20 12:35 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..)
>
> If PATCH 3 is made as PATCH 1, then existing PATCH (1&4) and PATCH (2&5) can be
> combined.
Does'nt that break bisectability?
include/environment/ti/ufs.h defines DEFAULT_UFS_TI_ARGS using
overlayaddr, include/configs/j721e_evm.h uses that macro in
CONFIG_EXTRA_ENV_SETTINGS, if I move patch 3 as patch 1, dtboaddr is not
defined since DEFAULT_LINUX_BOOT_ENV is not yet included..
I know that am654 probably does'nt use DEFAULT_UFS_TI_ARGS, but it
looked elegant to clean it up in stages together.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 0/5] configs: ti: am65x/j721e: Use DEFAULT_LINUX_BOOT_ENV
2020-10-07 12:11 ` Nishanth Menon
@ 2020-10-08 2:51 ` Nishanth Menon
0 siblings, 0 replies; 9+ messages in thread
From: Nishanth Menon @ 2020-10-08 2:51 UTC (permalink / raw)
To: u-boot
On 07:11-20201007, Nishanth Menon wrote:
> On 11:15-20201007, Lokesh Vutla wrote:
> >
> >
> > On 07/10/20 12:35 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..)
> >
> > If PATCH 3 is made as PATCH 1, then existing PATCH (1&4) and PATCH (2&5) can be
> > combined.
>
>
> Does'nt that break bisectability?
> include/environment/ti/ufs.h defines DEFAULT_UFS_TI_ARGS using
> overlayaddr, include/configs/j721e_evm.h uses that macro in
> CONFIG_EXTRA_ENV_SETTINGS, if I move patch 3 as patch 1, dtboaddr is not
> defined since DEFAULT_LINUX_BOOT_ENV is not yet included..
>
> I know that am654 probably does'nt use DEFAULT_UFS_TI_ARGS, but it
> looked elegant to clean it up in stages together.
Please see if https://patchwork.ozlabs.org/project/uboot/list/?series=206612
is sufficient without loosing bisect-ability.
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 9+ messages in thread