On 10/03/2018 04:38 AM, Rajesh Bhagat wrote: > CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE and CONFIG_ENV_SECT_SIZE made common > to support all boot sources.
It is not clear how you made these macros common in your change below. > > Signed-off-by: Pankit Garg <pankit.g...@nxp.com> > Signed-off-by: Rajesh Bhagat <rajesh.bha...@nxp.com> > --- > include/configs/ls1046aqds.h | 9 +++++++++ > include/configs/ls1046ardb.h | 8 ++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h > index 07e21469c8..765a21e00f 100644 > --- a/include/configs/ls1046aqds.h > +++ b/include/configs/ls1046aqds.h > @@ -403,6 +403,14 @@ unsigned long get_board_ddr_clk(void); > */ > #define CONFIG_ENV_OVERWRITE > > +#ifdef CONFIG_TFABOOT > +#define CONFIG_SYS_MMC_ENV_DEV 0 > + > +#define CONFIG_ENV_SIZE 0x2000 > +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ > +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + > 0x500000) > +#define CONFIG_ENV_SECT_SIZE 0x20000 > +#else > #ifdef CONFIG_NAND_BOOT > #define CONFIG_ENV_SIZE 0x2000 > #define CONFIG_ENV_OFFSET (12 * CONFIG_SYS_NAND_BLOCK_SIZE) > @@ -419,6 +427,7 @@ unsigned long get_board_ddr_clk(void); > #define CONFIG_ENV_SECT_SIZE 0x20000 > #define CONFIG_ENV_SIZE 0x20000 > #endif > +#endif > > #define CONFIG_CMDLINE_TAG > > diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h > index ffca410b1a..b8d9419b48 100644 > --- a/include/configs/ls1046ardb.h > +++ b/include/configs/ls1046ardb.h > @@ -160,6 +160,13 @@ > #define CONFIG_ENV_OVERWRITE > #endif > > +#ifdef CONFIG_TFABOOT > +#define CONFIG_SYS_MMC_ENV_DEV 0 > + > +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ > +#define CONFIG_ENV_OFFSET 0x500000 /* 5MB */ > +#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ > +#else > #if defined(CONFIG_SD_BOOT) > #define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_ENV_OFFSET (3 * 1024 * 1024) > @@ -169,6 +176,7 @@ > #define CONFIG_ENV_OFFSET 0x300000 /* 3MB */ > #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ > #endif > +#endif > > #define AQR105_IRQ_MASK 0x80000000 > /* FMan */ > You didn't add to common file, or move them out. How do you make them common? York _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
