[U-Boot] [PATCH 3/3] OMAP3:NAND: rename SMNAND_ENV_OFFSET

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Nishanth Menon <nm@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/3] OMAP3:NAND: rename SMNAND_ENV_OFFSET
Date: Mon, 13 Apr 2009 15:48:03 -0500	[thread overview]
Message-ID: <1239655683-16490-4-git-send-email-nm@ti.com> (raw)
In-Reply-To: <1239655683-16490-3-git-send-email-nm@ti.com>

SMNAND_ENV_OFFSET is more specific to Samsung
NAND, rename it to NAND_ENV_OFFSET

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 cpu/arm_cortexa8/omap3/mem.c    |    2 +-
 include/configs/omap3_beagle.h  |    4 ++--
 include/configs/omap3_evm.h     |    2 +-
 include/configs/omap3_overo.h   |    4 ++--
 include/configs/omap3_pandora.h |    4 ++--
 include/configs/omap3_zoom1.h   |    4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cpu/arm_cortexa8/omap3/mem.c b/cpu/arm_cortexa8/omap3/mem.c
index 9c90f32..ac126fd 100644
--- a/cpu/arm_cortexa8/omap3/mem.c
+++ b/cpu/arm_cortexa8/omap3/mem.c
@@ -248,7 +248,7 @@ void gpmc_init(void)
 	size = PISMO1_NAND_SIZE;
 	enable_gpmc_config(gpmc_config, nand_cs_base, base, size);
 #if defined(CONFIG_ENV_IS_IN_NAND)
-	f_off = SMNAND_ENV_OFFSET;
+	f_off = NAND_ENV_OFFSET;
 	f_sec = SZ_128K;
 	/* env setup */
 	boot_flash_base = base;
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 3f47b7a..30b2cfd 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -276,11 +276,11 @@
 
 #define CONFIG_ENV_IS_IN_NAND		1
 #define ONENAND_ENV_OFFSET		0x260000 /* environment starts here */
-#define SMNAND_ENV_OFFSET		0x260000 /* environment starts here */
+#define NAND_ENV_OFFSET			0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
-#define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
+#define CONFIG_ENV_ADDR			NAND_ENV_OFFSET
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 8cd8a1b..c33d981 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -268,7 +268,7 @@
 
 #define CONFIG_ENV_IS_IN_ONENAND	1
 #define ONENAND_ENV_OFFSET		0x260000 /* environment starts here */
-#define SMNAND_ENV_OFFSET		0x260000 /* environment starts here */
+#define NAND_ENV_OFFSET			0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 093f922..259b864 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -263,11 +263,11 @@
 
 #define CONFIG_ENV_IS_IN_NAND		1
 #define ONENAND_ENV_OFFSET		0x240000 /* environment starts here */
-#define SMNAND_ENV_OFFSET		0x240000 /* environment starts here */
+#define NAND_ENV_OFFSET			0x240000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
-#define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
+#define CONFIG_ENV_ADDR			NAND_ENV_OFFSET
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 7c3d2f0..7deecb7 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -265,11 +265,11 @@
 
 #define CONFIG_ENV_IS_IN_NAND		1
 #define ONENAND_ENV_OFFSET		0x240000 /* environment starts here */
-#define SMNAND_ENV_OFFSET		0x240000 /* environment starts here */
+#define NAND_ENV_OFFSET			0x240000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
-#define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
+#define CONFIG_ENV_ADDR			NAND_ENV_OFFSET
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 794ad96..34e6868 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -273,11 +273,11 @@
 
 #define CONFIG_ENV_IS_IN_NAND		1
 #define ONENAND_ENV_OFFSET		0x260000 /* environment starts here */
-#define SMNAND_ENV_OFFSET		0x260000 /* environment starts here */
+#define NAND_ENV_OFFSET			0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE	boot_flash_sec
 #define CONFIG_ENV_OFFSET		boot_flash_off
-#define CONFIG_ENV_ADDR			SMNAND_ENV_OFFSET
+#define CONFIG_ENV_ADDR			NAND_ENV_OFFSET
 
 /*-----------------------------------------------------------------------
  * CFI FLASH driver setup
-- 
1.5.4.3

next prev parent reply	other threads:[~2009-04-13 20:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-13 20:48 [U-Boot] [PATCH 0/3] OMAP3:NAND: Cleanup patchset Nishanth Menon
2009-04-13 20:48 ` [U-Boot] [PATCH 1/3] OMAP3:NAND: Change the NAND timing assignment Nishanth Menon
2009-04-13 20:48   ` [U-Boot] [PATCH 2/3] OMAP3:NAND: Change the NAND CS handling Nishanth Menon
2009-04-13 20:48     ` Nishanth Menon [this message]
2009-04-17  5:36       ` [U-Boot] [PATCH 3/3] OMAP3:NAND: rename SMNAND_ENV_OFFSET Jean-Christophe PLAGNIOL-VILLARD
2009-04-17  5:34     ` [U-Boot] [PATCH 2/3] OMAP3:NAND: Change the NAND CS handling Jean-Christophe PLAGNIOL-VILLARD
2009-04-17  5:33   ` [U-Boot] [PATCH 1/3] OMAP3:NAND: Change the NAND timing assignment Jean-Christophe PLAGNIOL-VILLARD

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9c90f32 dfblob:ac126fd dfblob:3f47b7a dfblob:30b2cfd
dfblob:8cd8a1b dfblob:c33d981 dfblob:093f922 dfblob:259b864
dfblob:7c3d2f0 dfblob:7deecb7 dfblob:794ad96 dfblob:34e6868 )
 OR (
bs:"[U-Boot] [PATCH 3/3] OMAP3:NAND: rename SMNAND_ENV_OFFSET" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1239655683-16490-4-git-send-email-nm@ti.com \
    --to=nm@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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