mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
ti: am43xx_evm: Switch to DISTRO_BOOT only
Remove the environment support for various legacy boot methods. With this, we will now default to booting any distribution that follows the generic distro boot framework and no longer attempt to boot various legacy (to this SoC) scripts/etc. Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Link: https://lore.kernel.org/r/20210701132612.7559-1-trini@konsulko.com
This commit is contained in:
Tom Rini
Lokesh Vutla
parent
8cc8c41bc5
commit
e0c91ae24e
6 changed files with 23 additions and 50 deletions
|
|
@ -12,7 +12,7 @@ CONFIG_SPL=y
|
|||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
# CONFIG_USE_SPL_FIT_GENERATOR is not set
|
||||
# CONFIG_USE_BOOTCOMMAND is not set
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_ETH_SUPPORT=y
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ CONFIG_ENV_OFFSET_REDUND=0x120000
|
|||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="QSPI,QSPI_BOOT"
|
||||
CONFIG_QSPI_BOOT=y
|
||||
# CONFIG_USE_BOOTCOMMAND is not set
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ CONFIG_SPL=y
|
|||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
# CONFIG_USE_SPL_FIT_GENERATOR is not set
|
||||
# CONFIG_USE_BOOTCOMMAND is not set
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ CONFIG_SPL=y
|
|||
CONFIG_DISTRO_DEFAULTS=y
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
# CONFIG_USE_SPL_FIT_GENERATOR is not set
|
||||
# CONFIG_USE_BOOTCOMMAND is not set
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ CONFIG_SPL_LOAD_FIT=y
|
|||
CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
|
||||
# CONFIG_USE_SPL_FIT_GENERATOR is not set
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
# CONFIG_USE_BOOTCOMMAND is not set
|
||||
CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
# CONFIG_MISC_INIT_R is not set
|
||||
CONFIG_SPL_ETH_SUPPORT=y
|
||||
|
|
|
|||
|
|
@ -108,59 +108,41 @@
|
|||
#define DFUARGS
|
||||
#endif
|
||||
|
||||
#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
|
||||
"bootcmd_" #devtypel "=" \
|
||||
"run nandboot\0"
|
||||
|
||||
#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
|
||||
#devtypel #instance " "
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(USB, usb, 0) \
|
||||
func(NAND, nand, 0) \
|
||||
func(PXE, pxe, na) \
|
||||
func(DHCP, dhcp, na)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#include <environment/ti/dfu.h>
|
||||
#include <environment/ti/mmc.h>
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV \
|
||||
DEFAULT_MMC_TI_ARGS \
|
||||
DEFAULT_FIT_TI_ARGS \
|
||||
"fdtfile=undefined\0" \
|
||||
"bootpart=0:2\0" \
|
||||
"bootdir=/boot\0" \
|
||||
"bootfile=zImage\0" \
|
||||
"finduuid=part uuid mmc 0:2 uuid\0" \
|
||||
"console=ttyO0,115200n8\0" \
|
||||
"partitions=" \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
|
||||
"optargs=\0" \
|
||||
"usbroot=/dev/sda2 rw\0" \
|
||||
"usbrootfstype=ext4 rootwait\0" \
|
||||
"usbdev=0\0" \
|
||||
"ramroot=/dev/ram0 rw\0" \
|
||||
"ramrootfstype=ext2\0" \
|
||||
"usbargs=setenv bootargs console=${console} " \
|
||||
"${optargs} " \
|
||||
"root=${usbroot} " \
|
||||
"rootfstype=${usbrootfstype}\0" \
|
||||
"ramargs=setenv bootargs console=${console} " \
|
||||
"${optargs} " \
|
||||
"root=${ramroot} " \
|
||||
"rootfstype=${ramrootfstype}\0" \
|
||||
"loadramdisk=load ${devtype} ${devnum} ${rdaddr} ramdisk.gz\0" \
|
||||
"usbboot=" \
|
||||
"setenv devnum ${usbdev}; " \
|
||||
"setenv devtype usb; " \
|
||||
"usb start ${usbdev}; " \
|
||||
"if usb dev ${usbdev}; then " \
|
||||
"if run loadbootenv; then " \
|
||||
"echo Loaded environment from ${bootenv};" \
|
||||
"run importbootenv;" \
|
||||
"fi;" \
|
||||
"if test -n $uenvcmd; then " \
|
||||
"echo Running uenvcmd ...;" \
|
||||
"run uenvcmd;" \
|
||||
"fi;" \
|
||||
"if run loadimage; then " \
|
||||
"run loadfdt; " \
|
||||
"echo Booting from usb ${usbdev}...; " \
|
||||
"run usbargs;" \
|
||||
"bootz ${loadaddr} - ${fdtaddr}; " \
|
||||
"fi;" \
|
||||
"fi\0" \
|
||||
"fi;" \
|
||||
"usb stop ${usbdev};\0" \
|
||||
"findfdt="\
|
||||
"if test $board_name = AM43EPOS; then " \
|
||||
"setenv fdtfile am43x-epos-evm.dtb; fi; " \
|
||||
|
|
@ -177,16 +159,7 @@
|
|||
NANDARGS \
|
||||
NETARGS \
|
||||
DFUARGS \
|
||||
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
"if test ${boot_fit} -eq 1; then " \
|
||||
"run update_to_fit;" \
|
||||
"fi;" \
|
||||
"run findfdt; " \
|
||||
"run envboot;" \
|
||||
"run mmcboot;" \
|
||||
"run usbboot;" \
|
||||
NANDBOOT \
|
||||
BOOTENV
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue