In mancy cases both CONFIG_ENV_OFFSET and CONFIG_ENV_ADDR point to an otherwise-unused SMNAND_ENV_OFFSET. This patch will set both CONFIG_ENV_OFFSET and CONFIG_ENV_ADDR to whatever value was defined by SMNAND_ENV_OFFSET.

Signed-off-by: Adam Ford aford173@gmail.com --- include/configs/am3517_crane.h | 5 ++--- include/configs/am3517_evm.h | 5 ++--- include/configs/cm_t35.h | 5 ++--- include/configs/cm_t3517.h | 5 ++--- include/configs/devkit8000.h | 3 +-- include/configs/mcx.h | 5 ++--- include/configs/omap3_beagle.h | 5 ++--- include/configs/omap3_cairo.h | 5 ++--- include/configs/omap3_evm.h | 5 ++--- include/configs/omap3_logic.h | 5 ++--- include/configs/omap3_overo.h | 6 ++---- include/configs/omap3_pandora.h | 5 ++--- include/configs/omap3_zoom1.h | 5 ++--- include/configs/tam3517-common.h | 5 ++--- include/configs/tao3530.h | 3 +-- 15 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index edaa384..c5fe3dc 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -207,11 +207,10 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE

#define CONFIG_NAND_OMAP_GPMC -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

/*----------------------------------------------------------------------- * CFI FLASH driver setup diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 5435ca8..d0cf740 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -278,9 +278,8 @@

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_ENV_SIZE CONFIG_SYS_ENV_SECT_SIZE -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

/* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index d30b783..30e20b8 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -207,9 +207,8 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */

-#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

#if defined(CONFIG_CMD_NET) #define CONFIG_SMC911X diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 282b7ae..c166bf7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -209,9 +209,8 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */

-#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

#if defined(CONFIG_CMD_NET) #define CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 2bf0983..bd325e1 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -174,9 +174,8 @@ 0x01000000) /* 16MB */

/* NAND and environment organization */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

-#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000

/* SRAM config */ #define CONFIG_SYS_SRAM_START 0x40200000 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index c06d618..030e403 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -247,12 +247,11 @@ #define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */

/* Redundant Environment */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x180000 +#define CONFIG_ENV_ADDR 0x180000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ 2 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 26e2c8d..e097179 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -244,11 +244,10 @@

#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

/* Defines for SPL */

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index b4d7f17..417d45b 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -170,11 +170,10 @@

#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ #define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

/* Defines for SPL */

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 2c48b4f..efec572 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -66,10 +66,9 @@ #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000 #define CONFIG_ENV_OVERWRITE #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* NAND: SPL falcon mode configs */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index a4a40f4..7aaece7 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -236,11 +236,10 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE

#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

/* SMSC922x Ethernet */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index d53657f..cb92bd9 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -175,11 +175,9 @@ #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP

#define ONENAND_ENV_OFFSET 0x240000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x240000 /* environment starts here */ - #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x240000 +#define CONFIG_ENV_ADDR 0x240000

/* Configure SMSC9211 ethernet */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 7f1b571..7d5e926 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -99,10 +99,9 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE

-#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

#endif /* __CONFIG_H */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c6db88a..cbbe7d4 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -149,11 +149,10 @@ #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP

#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000

#ifdef CONFIG_CMD_NET /* Ethernet (LAN9211 from SMSC9118 family) */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 0539909..2363912 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -126,12 +126,11 @@

/* **** PISMO SUPPORT *** */ #define CONFIG_NAND_OMAP_GPMC -#define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */

/* Redundant Environment */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x180000 +#define CONFIG_ENV_ADDR 0x180000 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ 2 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 40321e7..df22429 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -192,10 +192,9 @@ #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP

#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */

#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) -#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET

#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1