configs: am65x_evm: Switch envboot out for distro_bootcmd
PATCH v2 1/1 configs: am65x_evm: Switch envboot out for distro_bootcmd
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 <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
Changes in v2:
- Only change to distroboot for a53 and not r5.
--- configs/am65x_evm_a53_defconfig | 2 +- include/configs/am65x_evm.h | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
configs/am65x_evm_a53_defconfig +1 -1
@@ -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
include/configs/am65x_evm.h +12 -2
@@ -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,16 @@DFU_ALT_INFO_EMMC \ DFU_ALT_INFO_OSPI +#ifdef CONFIG_TARGET_AM654_A53_EVM +#define BOOT_TARGET_DEVICES (func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) + +#include <config_distro_bootcmd.h> +#else +#define BOOTENV +#endif +/* Incorporate settings into the U-Boot environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \
@@ -136,7 +145,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
Signature · 1 line
2.17.1
Quoted 3 lines · Tom Rini
Swap out the TI-centric "envboot" logic for the generic
distro_bootcmdlogic for the bootcmd we run before trying to do something more complex involving additional firmware, etc.
Applied to https://source.denx.de/u-boot/custodians/u-boot-ti.git for-rc, thanks! [1/1] configs: am65x_evm: Switch envboot out for distro_bootcmd
https://source.denx.de/u-boot/custodians/u-boot-ti/-/commit/6e188a4f7d
--
Thanks and Regards,
Lokesh