[PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd

[PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd

[Tom Rini]

Swap out the TI-centric "envboot" logic for the generic distro_bootcmd
logic for the bootcmd we run before trying to do something more complex
involving additional firmware, etc.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/am65x_evm_a53_defconfig |  2 +-
 include/configs/am65x_evm.h     | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 6f9309e17147..eefcdfa36571 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
+CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
 CONFIG_LOGLEVEL=7
 CONFIG_CONSOLE_MUX=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 8c50fe9d11ff..749689ca3610 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -10,7 +10,6 @@
 #define __CONFIG_AM654_EVM_H
 
 #include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
 #include <environment/ti/mmc.h>
 #include <environment/ti/k3_rproc.h>
 #include <environment/ti/k3_dfu.h>
@@ -126,6 +125,12 @@
 	DFU_ALT_INFO_EMMC						\
 	DFU_ALT_INFO_OSPI
 
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 1) \
+	func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+
 /* Incorporate settings into the U-Boot environment */
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
@@ -136,7 +141,8 @@
 	EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD				\
 	EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI				\
 	EXTRA_ENV_RPROC_SETTINGS					\
-	EXTRA_ENV_DFUARGS
+	EXTRA_ENV_DFUARGS						\
+	BOOTENV
 
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
 
-- 
2.17.1

Re: [PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd

[Lokesh Vutla]

On 02/07/21 1:34 am, Tom Rini wrote:
> Swap out the TI-centric "envboot" logic for the generic distro_bootcmd
> logic for the bootcmd we run before trying to do something more complex
> involving additional firmware, etc.
> 
> Cc: Lokesh Vutla <lokeshvutla@ti.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>

This is causing build errors for am6 platforms.
https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/291139

Thanks and regards,
Lokesh

> ---
>  configs/am65x_evm_a53_defconfig |  2 +-
>  include/configs/am65x_evm.h     | 10 ++++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
> index 6f9309e17147..eefcdfa36571 100644
> --- a/configs/am65x_evm_a53_defconfig
> +++ b/configs/am65x_evm_a53_defconfig
> @@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
>  CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>  CONFIG_OF_BOARD_SETUP=y
> -CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
> +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
>  CONFIG_LOGLEVEL=7
>  CONFIG_CONSOLE_MUX=y
>  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
> diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
> index 8c50fe9d11ff..749689ca3610 100644
> --- a/include/configs/am65x_evm.h
> +++ b/include/configs/am65x_evm.h
> @@ -10,7 +10,6 @@
>  #define __CONFIG_AM654_EVM_H
>  
>  #include <linux/sizes.h>
> -#include <config_distro_bootcmd.h>
>  #include <environment/ti/mmc.h>
>  #include <environment/ti/k3_rproc.h>
>  #include <environment/ti/k3_dfu.h>
> @@ -126,6 +125,12 @@
>  	DFU_ALT_INFO_EMMC						\
>  	DFU_ALT_INFO_OSPI
>  
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 1) \
> +	func(MMC, mmc, 0)
> +
> +#include <config_distro_bootcmd.h>
> +
>  /* Incorporate settings into the U-Boot environment */
>  #define CONFIG_EXTRA_ENV_SETTINGS					\
>  	DEFAULT_LINUX_BOOT_ENV						\
> @@ -136,7 +141,8 @@
>  	EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD				\
>  	EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI				\
>  	EXTRA_ENV_RPROC_SETTINGS					\
> -	EXTRA_ENV_DFUARGS
> +	EXTRA_ENV_DFUARGS						\
> +	BOOTENV
>  
>  #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
>  
> 

Re: [PATCH] configs: am65x_evm: Switch envboot out for distro_bootcmd

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

On Tue, Jul 13, 2021 at 02:33:15PM +0530, Lokesh Vutla wrote:
> 
> 
> On 02/07/21 1:34 am, Tom Rini wrote:
> > Swap out the TI-centric "envboot" logic for the generic distro_bootcmd
> > logic for the bootcmd we run before trying to do something more complex
> > involving additional firmware, etc.
> > 
> > Cc: Lokesh Vutla <lokeshvutla@ti.com>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> 
> This is causing build errors for am6 platforms.
> https://source.denx.de/u-boot/custodians/u-boot-ti/-/jobs/291139

Ah, whopos.  While I'm a little puzzled by why we have so many r5
configs, I see what to change here, v2 shortly.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]