LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs: am64x_evm: Fix MMC boot regression caused by NAND support 

The environment bootpart is used for MMC boot so we need to use
something different for NAND boot, else we break MMC boot.

Fixes: commit 7d0227061f ("configs: am64x_evm: Support u-boot environment in NAND")
Signed-off-by: Roger Quadros <rogerq@kernel.org>
Tested-by: Dave Gerlach <d-gerlach@ti.com>
This commit is contained in:
Roger Quadros 2022-04-06 22:03:04 +03:00 committed by Praneeth Bajjuri
parent c579d4ee4e
commit 1a84f06f9f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/configs/am64x_evm.h
View File

@ -171,14 +171,14 @@
"run run_kern\0"
#define EXTRA_ENV_AM642_BOARD_SETTINGS_NAND \
"bootpart=NAND.file-system\0" \
"bootvolume=ubi0:rootfs\0" \
"nbootpart=NAND.file-system\0" \
"nbootvolume=ubi0:rootfs\0" \
"bootdir=/boot\0" \
"rd_spec=-\0" \
"ubi_init=ubi part ${bootpart}; ubifsmount ${bootvolume};\0" \
"ubi_init=ubi part ${nbootpart}; ubifsmount ${nbootvolume};\0" \
"args_nand=setenv bootargs console=${console} " \
"${optargs} ubi.mtd=${bootpart} " \
"root=${bootvolume} rootfstype=ubifs\0" \
"${optargs} ubi.mtd=${nbootpart} " \
"root=${nbootvolume} rootfstype=ubifs\0" \
"init_nand=run args_all args_nand ubi_init\0" \
"get_fdt_nand=ubifsload ${fdtaddr} ${bootdir}/${fdtfile};\0" \
"get_overlay_nand=" \