public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND
@ 2013-04-30 20:05 Tom Rini
  2013-04-30 20:05 ` [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment Tom Rini
  2013-05-02 16:04 ` [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini
  0 siblings, 2 replies; 4+ messages in thread
From: Tom Rini @ 2013-04-30 20:05 UTC (permalink / raw)
  To: u-boot

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
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment
  2013-04-30 20:05 [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini
@ 2013-04-30 20:05 ` Tom Rini
  2013-04-30 20:22   ` Nishanth Menon
  2013-05-02 16:04 ` [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini
  1 sibling, 1 reply; 4+ messages in thread
From: Tom Rini @ 2013-04-30 20:05 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment
  2013-04-30 20:05 ` [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment Tom Rini
@ 2013-04-30 20:22   ` Nishanth Menon
  0 siblings, 0 replies; 4+ messages in thread
From: Nishanth Menon @ 2013-04-30 20:22 UTC (permalink / raw)
  To: u-boot

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 at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

-- 
Regards,
Nishanth Menon

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND
  2013-04-30 20:05 [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini
  2013-04-30 20:05 ` [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment Tom Rini
@ 2013-05-02 16:04 ` Tom Rini
  1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2013-05-02 16:04 UTC (permalink / raw)
  To: 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!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130502/00074a9c/attachment.pgp>

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-02 16:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-30 20:05 [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini
2013-04-30 20:05 ` [U-Boot] [PATCH 2/2] omap5_uevm: Enable redudnant MMC environment Tom Rini
2013-04-30 20:22   ` Nishanth Menon
2013-05-02 16:04 ` [U-Boot] [PATCH 1/2] mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox