Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

configs: j721e_evm: Switch envboot out for distro_bootcmd

Browse source 
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> (maintainer:J721E BOARD)
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210701142743.26190-1-trini@konsulko.com
This commit is contained in:
Tom Rini 2021-07-01 10:27:43 -04:00 committed by Lokesh Vutla
parent 5fb3e09d97
commit 7a376302f5
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/j721e_evm_a72_defconfig
View file

@ -29,7 +29,7 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
# CONFIG_USE_SPL_FIT_GENERATOR is not set # 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_LOGLEVEL=7
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y

24
include/configs/j721e_evm.h
View file

@ -10,7 +10,6 @@
#define __CONFIG_J721E_EVM_H #define __CONFIG_J721E_EVM_H
#include <linux/sizes.h> #include <linux/sizes.h>
#include <config_distro_bootcmd.h>
#include <environment/ti/mmc.h> #include <environment/ti/mmc.h>
#include <environment/ti/k3_rproc.h> #include <environment/ti/k3_rproc.h>
#include <environment/ti/ufs.h> #include <environment/ti/ufs.h>
@ -160,6 +159,26 @@
#define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD #define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD
#endif #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 */ /* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \ DEFAULT_LINUX_BOOT_ENV \
@ -170,7 +189,8 @@
EXTRA_ENV_RPROC_SETTINGS \ EXTRA_ENV_RPROC_SETTINGS \
EXTRA_ENV_DFUARGS \ EXTRA_ENV_DFUARGS \
DEFAULT_UFS_TI_ARGS \ DEFAULT_UFS_TI_ARGS \
EXTRA_ENV_J721E_BOARD_SETTINGS_MTD EXTRA_ENV_J721E_BOARD_SETTINGS_MTD \
BOOTENV
/* Now for the remaining common defines */ /* Now for the remaining common defines */
#include <configs/ti_armv7_common.h> #include <configs/ti_armv7_common.h>