configs: j721e_evm: Switch envboot out for distro_bootcmd
PATCH 1/1 configs: j721e_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]> (maintainer:J721E BOARD)
Signed-off-by Tom Rini <[email protected]>
--- configs/j721e_evm_a72_defconfig | 2 +- include/configs/j721e_evm.h | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-)
configs/j721e_evm_a72_defconfig +1 -1
@@ -29,7 +29,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 # CONFIG_USE_SPL_FIT_GENERATOR is not set -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_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
include/configs/j721e_evm.h +22 -2
@@ -10,7 +10,6 @@#define __CONFIG_J721E_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/ufs.h>
@@ -160,6 +159,26 @@#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD #endif +#if CONFIG_IS_ENABLED (CMD_PXE ) +# define BOOT_TARGET_PXE (func) func(PXE, pxe, na) +#else +# define BOOT_TARGET_PXE (func) +#endif + +#if CONFIG_IS_ENABLED (CMD_DHCP ) +# define BOOT_TARGET_DHCP (func) func(DHCP, dhcp, na) +#else +# define BOOT_TARGET_DHCP (func) +#endif + +#define BOOT_TARGET_DEVICES (func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) + +#include <config_distro_bootcmd.h> +/* Incorporate settings into the U-Boot environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \
@@ -170,7 +189,8 @@EXTRA_ENV_RPROC_SETTINGS \ EXTRA_ENV_DFUARGS \ DEFAULT_UFS_TI_ARGS \ -EXTRA_ENV_J721E_BOARD_SETTINGS_MTD + EXTRA_ENV_J721E_BOARD_SETTINGS_MTD \ + BOOTENV/* Now for the remaining common defines */ #include <configs/ti_armv7_common.h>
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: j721e_evm: Switch envboot out for distro_bootcmd
https://source.denx.de/u-boot/custodians/u-boot-ti/-/commit/bb721e7edb
--
Thanks and Regards,
Lokesh