Skip to contentSkip to conversation

board: ti: am6x: Switch to standard boot

PATCH In review Roger Quadros 4 participants 12 messages Oct 5, 2023 – Oct 12, 2023

lore
Share & tools
lore
#0 lore raw

v2 cover board: ti: am6x: Switch to standard boot

Hi,

This series switches am64x to standard boot flow.
Also minor fix to am62x boot targets.

NOTE:
Tested on AM64x GP EVM but I had to hand edit the grub.cfg file provided with the TI release [1]

from,

menuentry 'boot'{
linux /Image root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 }

to,

menuentry 'boot'{
linux /Image console=ttyS2,115200n8 root=PARTUUID=3a4a99a8-02 rootwait rootfstype=ext4 }

else there is no console output.

[1] https://dr-download.ti.com/software-development/software-development-kit-sdk/MD-yXgchBCk98/09.00.00.03/tisdk-default-image-am64xx-evm.wic.xz

cheers,
-roger

Changelog:
v2:
- Added Nishanth's Reviewed-by for patch 1
- Dropped unnecessary headers and macro from patch 2

Roger Quadros (2):
board: ti: am62x: am62x.env: Fix boot_targets
board: ti: am64x: Switch to standard boot flow

 board/ti/am62x/am62x.env        | 2 +-
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 4 files changed, 5 insertions(+), 12 deletions(-)

base-commit: e29b932aa07fa0226d325b35d96cd4eea0370129
prerequisite-patch-id: afb49f33f198747451687f83936f039049365924
prerequisite-patch-id: 1d8297eb0a3b44d8578cae785cc22f0fb6077239
prerequisite-patch-id: 4ae9fdc0b3737e55289a78a59d546a08c03d62e5
prerequisite-patch-id: 2be0e0caf153bec2c453b2f21342ba207c1ee13d
prerequisite-patch-id: 7710703ce9a41b72ff3fb89abf0823625a5b5454
prerequisite-patch-id: 60d61440bf0ab8c0bea8b971ef18aa6d0d26e113
prerequisite-patch-id: c974e6d80489cbb0ee8cc1f3e19bcc9cf47f25b6

Signature · 1 line
2.34.1
#1 lore raw

PATCH v2 1/2 board: ti: am62x: am62x.env: Fix boot_targets

ti_mmc is not a valid boot_target for standard boot flow so remove it. Prefer mmc1 (sd-card) over mmc0 (emmc).

---
 board/ti/am62x/am62x.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/ti/am62x/am62x.env +1 -1
index 22a6c2c91b..e53a55c38f 100644
@@ -8,7 +8,7 @@ args_all=setenv optargs ${optargs} earlycon=ns16550a,mmio32,0x02800000
 	${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
-boot_targets=ti_mmc mmc0 mmc1 usb pxe dhcp
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
Signature · 1 line
2.34.1
#3 lore raw

PATCH v2 2/2 board: ti: am64x: Switch to standard boot flow

In reply to Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -9
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1		0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
Signature · 1 line
2.34.1
Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

Quoted 67 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -9
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1		0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>
 
Signature · 1 line
2.34.1
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#5 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

In reply to Roger Quadros

Hi Roger,

Quoted 54 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -1
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>

include/configs/am64x_evm.h line 13

Quoted 10 lines
include/configs/am64x_evm.h +0 -8
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1            0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

I suspect that with your patch as is, the environment is still full of scripts?

Quoted 4 lines
include/configs/am64x_evm.h +0 -1
--

2.34.1

Regards,
Simon

#6 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

Quoted 72 lines · Simon Glass

Hi Roger,

Quoted 54 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -1
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>

include/configs/am64x_evm.h line 13

Quoted 10 lines
include/configs/am64x_evm.h +0 -8
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1            0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

Quoted 1 line

I suspect that with your patch as is, the environment is still full of scripts?

There's a lot of TI platforms, so I'm not sure what "#if" you're thinking of might make it cleaner? We could / should move some of the still relevant content and comments from that file to include/env/ti/ti_armv7_common.env as I do think some of the K3 platforms could just drop <configs/ti_armv7_common.h> at this point.

Signature · 1 line
Tom
#7 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

On 12:31-20231005, Tom Rini wrote:
[...]

Quoted 7 lines
Quoted 7 lines
Quoted 2 lines

/* Now for the remaining common defines */
#include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

Quoted 7 lines
Quoted 1 line

I suspect that with your patch as is, the environment is still full of scripts?

There's a lot of TI platforms, so I'm not sure what "#if" you're thinking of might make it cleaner? We could / should move some of the still relevant content and comments from that file to include/env/ti/ti_armv7_common.env as I do think some of the K3 platforms could just drop <configs/ti_armv7_common.h> at this point.

Is'nt the header distro_bootcmd.h and related stuff under #ifdef CONFIG_DISTRO_DEFAULTS already?

So, all we are picking up in effect is really CFG_SYS_SDRAM_BASE - which is consistent across platforms.

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#8 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

Quoted 12 lines · Nishanth Menon

On 12:31-20231005, Tom Rini wrote:
[...]

Quoted 9 lines
Quoted 8 lines
Quoted 2 lines

/* Now for the remaining common defines */
#include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

I suspect that with your patch as is, the environment is still full of scripts?

Quoted 8 lines
Quoted 5 lines

There's a lot of TI platforms, so I'm not sure what "#if" you're thinking of might make it cleaner? We could / should move some of the still relevant content and comments from that file to include/env/ti/ti_armv7_common.env as I do think some of the K3 platforms could just drop <configs/ti_armv7_common.h> at this point.

Is'nt the header distro_bootcmd.h and related stuff under #ifdef CONFIG_DISTRO_DEFAULTS already?

That's true too. The file (and probably all of the other *common.h ones) likely need some cleaning out of dead comments, etc, from the Kconfig migration.

Signature · 1 line
Tom
#9 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

In reply to Tom Rini

Hi Tom,

Quoted 74 lines · Tom Rini
Quoted 72 lines · Simon Glass

Hi Roger,

Quoted 54 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -1
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>

include/configs/am64x_evm.h line 13

Quoted 10 lines
include/configs/am64x_evm.h +0 -8
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1            0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

Quoted 7 lines
Quoted 1 line

I suspect that with your patch as is, the environment is still full of scripts?

There's a lot of TI platforms, so I'm not sure what "#if" you're thinking of might make it cleaner? We could / should move some of the still relevant content and comments from that file to include/env/ti/ti_armv7_common.env as I do think some of the K3 platforms could just drop <configs/ti_armv7_common.h> at this point.

OK so if they are using text env then the header-file stuff doesn't matter since I believe it is ignored? I was thinking of something like:

#ifdef CONFIG_DISTRO_DEFAULTS

do all the distro #defines

#endif

Regards,
Simon

#10 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

Hi Simon,

Quoted 89 lines · Simon Glass

Hi Tom,

Quoted 74 lines · Tom Rini
Quoted 72 lines · Simon Glass

Hi Roger,

Quoted 54 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

---
 board/ti/am64x/am64x.env        | 1 +
 configs/am64x_evm_a53_defconfig | 5 +++--
 include/configs/am64x_evm.h     | 9 ---------
 3 files changed, 4 insertions(+), 11 deletions(-)
board/ti/am64x/am64x.env +1 -0
index 68e42222b7..efd736b99b 100644
@@ -15,6 +15,7 @@ console=ttyS2,115200n8
 args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 ${mtdparts}
 run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}
 
+boot_targets=mmc1 mmc0 usb pxe dhcp
 boot=mmc
 mmcdev=1
 bootpart=1:2
configs/am64x_evm_a53_defconfig +3 -2
index 718ad176cb..43bfcf957a 100644
@@ -31,8 +31,9 @@ CONFIG_SPL_SPI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;"
+CONFIG_BOOTSTD_FULL=y
+CONFIG_BOOTSTD_DEFAULTS=y
+CONFIG_BOOTCOMMAND="run envboot; bootflow scan -lb"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_MAX_SIZE=0x180000
 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
include/configs/am64x_evm.h +0 -1
index 062102a610..f9f8c7bc2f 100644
@@ -9,15 +9,6 @@
 #ifndef __CONFIG_AM642_EVM_H
 #define __CONFIG_AM642_EVM_H
 
-#include <linux/sizes.h>

include/configs/am64x_evm.h line 13

Quoted 10 lines
include/configs/am64x_evm.h +0 -8
-#include <config_distro_bootcmd.h>
-#include <env/ti/mmc.h>
-#include <asm/arch/am64_hardware.h>
-#include <env/ti/k3_dfu.h>
-
-/* DDR Configuration */
-#define CFG_SYS_SDRAM_BASE1            0x880000000
-
 /* Now for the remaining common defines */
 #include <configs/ti_armv7_common.h>

It looks like this file still includes distro_bootcmd and defines all the BOOT_TARGET things. Can they be dropped? Perhaps for now they could be put behind an #ifdef if other boards need them?

Quoted 7 lines
Quoted 1 line

I suspect that with your patch as is, the environment is still full of scripts?

There's a lot of TI platforms, so I'm not sure what "#if" you're thinking of might make it cleaner? We could / should move some of the still relevant content and comments from that file to include/env/ti/ti_armv7_common.env as I do think some of the K3 platforms could just drop <configs/ti_armv7_common.h> at this point.

OK so if they are using text env then the header-file stuff doesn't matter since I believe it is ignored? I was thinking of something like:

Quoted 5 lines

#ifdef CONFIG_DISTRO_DEFAULTS

do all the distro #defines

#endif

This is already done, although within #ifdef CONFIG_ARM64 ...

All we are picking up is really CFG_SYS_SDRAM_BASE.

Cleaning up ti_armv7_common.h should be a separate series and involve testing on all affected platforms (entire TI range) :P.

Signature · 2 lines
cheers,
-roger
#11 lore raw

Re: [PATCH v2 2/2] board: ti: am64x: Switch to standard boot flow

In reply to Roger Quadros
Quoted 11 lines · Roger Quadros

Switch to using bootstd. Note with this change, we will stop using distro_bootcmd and instead depend entirely on bootflow method of starting the system up.

Drop header files that are no longer needed in am64x_evm.h. k3_dfu.h is available via k3_dfu.env in am64x.env.

Drop unused macro CFG_SYS_SDRAM_BASE1.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom