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