[U-Boot] [PATCH 4/5] T1042RDB_PI_NAND_SECURE_BOOT: SECURE_BOOT means environment is nowhere

[Tom Rini]

On Fri, Nov 15, 2019 at 12:43:48PM +0000, Priyanka Jain wrote:
> 
> 
> >-----Original Message-----
> >From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Tom Rini
> >Sent: Thursday, November 14, 2019 8:24 PM
> >To: u-boot at lists.denx.de
> >Subject: [U-Boot] [PATCH 4/5] T1042RDB_PI_NAND_SECURE_BOOT:
> >SECURE_BOOT means environment is nowhere
> >
> >Signed-off-by: Tom Rini <trini at konsulko.com>
> >---
> > board/freescale/t104xrdb/spl.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> >diff --git a/board/freescale/t104xrdb/spl.c b/board/freescale/t104xrdb/spl.c
> >index 7b0eb8edf51d..76b5160cf903 100644
> >--- a/board/freescale/t104xrdb/spl.c
> >+++ b/board/freescale/t104xrdb/spl.c
> >@@ -106,6 +106,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)  #endif
> >
> > 	/* relocate environment function pointers etc. */
> >+#ifndef CONFIG_NXP_ESBC
> Can we use some ENV related config instead of this?

We could but I think that's more fragile / complex:

> > #ifdef CONFIG_SPL_NAND_BOOT
> > 	nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,
> > 			    (uchar *)CONFIG_ENV_ADDR);
> >@@ -120,6 +121,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

The endif goes here since we have cases on NAND / MMC / SPI loading the
environment and then we say it's now valid (and where it is).  We could
do:
#if defined(CONFIG_ENV_IS_IN_NAND) || defined(CONFIG_ENV_IS_IN_MMC) || \
	defined(CONFIG_ENV_IS_IN__SPI_FLASH)

if you prefer instead of CONFIG_NXP_ESBC

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191115/1f8d6de5/attachment.sig>