diff options
| author | Roger Quadros <rogerq@kernel.org> | 2022-04-06 22:03:04 +0300 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2022-04-06 15:12:09 -0500 |
| commit | 1a84f06f9fb45e0730c852ad7d9ab8cd4a3dec3a (patch) | |
| tree | a4cb92b4ed28b4a9ab45dbf4b0f48556b8244b6a /include/configs | |
| parent | c579d4ee4e342e706fcd494dd2c874584ce200c2 (diff) | |
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 7d0227061f3ad ("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>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am64x_evm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/configs/am64x_evm.h b/include/configs/am64x_evm.h index e5fc14a702..b400d01dc4 100644 --- a/include/configs/am64x_evm.h +++ b/include/configs/am64x_evm.h @@ -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=" \ |