random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

configs: am65x_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>
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210713141139.15183-1-trini@konsulko.com
This commit is contained in:
Tom Rini 2021-07-13 10:11:39 -04:00 committed by Lokesh Vutla
parent 5230625854
commit bde6ac5490
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/am65x_evm_a53_defconfig
View File

@ -29,7 +29,7 @@ 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_OF_BOARD_SETUP=y 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_LOGLEVEL=7
CONFIG_CONSOLE_MUX=y CONFIG_CONSOLE_MUX=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y

14
include/configs/am65x_evm.h
View File

@ -10,7 +10,6 @@
#define __CONFIG_AM654_EVM_H #define __CONFIG_AM654_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/k3_dfu.h> #include <environment/ti/k3_dfu.h>
@ -126,6 +125,16 @@
DFU_ALT_INFO_EMMC \ DFU_ALT_INFO_EMMC \
DFU_ALT_INFO_OSPI 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 */ /* 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 \
@ -136,7 +145,8 @@
EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD \ EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD \
EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI \ EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI \
EXTRA_ENV_RPROC_SETTINGS \ EXTRA_ENV_RPROC_SETTINGS \
EXTRA_ENV_DFUARGS EXTRA_ENV_DFUARGS \
BOOTENV
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1