diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-18 20:02:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-20 18:31:24 -0500 |
| commit | 8160c38ca1fde4386db5a4ee07e86e397a4914df (patch) | |
| tree | 43fe751b15c6e1a6b88b16c4de86ad36fd13051b | |
| parent | dbcb4dae36cf345bb937fe14af07bbf44ba394b5 (diff) | |
| download | u-boot-8160c38ca1fde4386db5a4ee07e86e397a4914df.tar.gz | |
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>
| -rw-r--r-- | board/freescale/t104xrdb/spl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c index 7b0eb8edf5..7df371df4d 100644 --- a/board/freescale/t104xrdb/spl.c +++ b/board/freescale/t104xrdb/spl.c @@ -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(); |