[U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND

The redundancy related defines are only correct for NAND, so guard all of that area with CONFIG_ENV_IS_IN_NAND
Cc: Fabio Estevam fabio.estevam@freescale.com Signed-off-by: Tom Rini trini@ti.com --- include/configs/mx28evk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index d470b47..3747955 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -138,14 +138,14 @@ #define CONFIG_SYS_NAND_5_ADDR_CYCLE
/* Environment is in NAND */ +#ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_RANGE (512 * 1024) -#ifndef CONFIG_ENV_OFFSET #define CONFIG_ENV_OFFSET 0x300000 -#endif #define CONFIG_ENV_OFFSET_REDUND \ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) +#endif
#define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS

Cc: Sricharan R r.sricharan@ti.com Signed-off-by: Tom Rini trini@ti.com --- include/configs/omap5_uevm.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 240fdfc..550cabd 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -44,6 +44,8 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_OFFSET 0xE0000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_CMD_SAVEENV
/* Enhance our eMMC support / experience. */

nit: $subject: s/redudnant/redundant/ On 16:05-20130430, Tom Rini wrote:
Cc: Sricharan R r.sricharan@ti.com Signed-off-by: Tom Rini trini@ti.com
include/configs/omap5_uevm.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 240fdfc..550cabd 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -44,6 +44,8 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ #define CONFIG_ENV_OFFSET 0xE0000 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT #define CONFIG_CMD_SAVEENV
/* Enhance our eMMC support / experience. */
1.7.9.5
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot

On Tue, Apr 30, 2013 at 04:05:17PM -0400, Tom Rini wrote:
The redundancy related defines are only correct for NAND, so guard all of that area with CONFIG_ENV_IS_IN_NAND
Cc: Fabio Estevam fabio.estevam@freescale.com Signed-off-by: Tom Rini trini@ti.com
Along with 2/2 (and typo fix), applied to u-boot/master, thanks!
participants (2)
-
Nishanth Menon
-
Tom Rini