T1042RDB_PI_NAND_SECURE_BOOT: Guard t104xrdb SPL env code

We can only configure and set the environment in SPL when we have a
particular environment location set that is not "nowhere" like it is in
SECURE_BOOT designs.  Update the code to reflect that.

Cc: Priyanka Jain <priyanka.jain@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Tom Rini 2019-11-18 20:02:09 -05:00
parent dbcb4dae36
commit 8160c38ca1

View File

@ -106,6 +106,8 @@ void board_init_r(gd_t *gd, ulong dest_addr)
#endif
/* relocate environment function pointers etc. */
#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_MMC) || \
defined(CONFIG_ENV_IS_IN_SPI_FLASH)
#ifdef CONFIG_SPL_NAND_BOOT
nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
(uchar *)CONFIG_ENV_ADDR);
@ -120,6 +122,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
#endif
gd->env_addr = (ulong)(CONFIG_ENV_ADDR);
gd->env_valid = ENV_VALID;
#endif
i2c_init_all();