| Message ID | 20231004132324.44198-3-rogerq@kernel.org |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | board: ti: am6x: Switch to standard boot | expand |
On 16:23-20231004, Roger Quadros wrote: > 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. > > Signed-off-by: Roger Quadros <rogerq@kernel.org> > --- > board/ti/am64x/am64x.env | 1 + > configs/am64x_evm_a53_defconfig | 5 +++-- > include/configs/am64x_evm.h | 2 -- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env > index 68e42222b7..efd736b99b 100644 > --- a/board/ti/am64x/am64x.env > +++ b/board/ti/am64x/am64x.env > @@ -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 > diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig > index 718ad176cb..43bfcf957a 100644 > --- a/configs/am64x_evm_a53_defconfig > +++ b/configs/am64x_evm_a53_defconfig > @@ -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 > diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h > index 062102a610..d3d9eac8b6 100644 > --- a/include/configs/am64x_evm.h > +++ b/include/configs/am64x_evm.h > @@ -10,8 +10,6 @@ > #define __CONFIG_AM642_EVM_H > > #include <linux/sizes.h> Do we really need this? > -#include <config_distro_bootcmd.h> > -#include <env/ti/mmc.h> > #include <asm/arch/am64_hardware.h> OR this? > #include <env/ti/k3_dfu.h> you dont need k3_dfu.h either. the env setup is already in board/ti/am64x/am64x.env (k3_dfu.env) and we dont seem to be using CFG_SYS_SDRAM_BASE1 might be that we could reduce it down to am62x_evm.h ? > > -- > 2.34.1 >
diff --git a/board/ti/am64x/am64x.env b/board/ti/am64x/am64x.env index 68e42222b7..efd736b99b 100644 --- a/board/ti/am64x/am64x.env +++ b/board/ti/am64x/am64x.env @@ -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 diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index 718ad176cb..43bfcf957a 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -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 diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index 062102a610..d3d9eac8b6 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -10,8 +10,6 @@ #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>
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. Signed-off-by: Roger Quadros <rogerq@kernel.org> --- board/ti/am64x/am64x.env | 1 + configs/am64x_evm_a53_defconfig | 5 +++-- include/configs/am64x_evm.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-)