include/configs: remove references to SMNAND_ENV_OFFSET

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>

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index edaa384213d5fd875786b8724b34e8fb0748de62..c5fe3dcba63ac129dbd64d5289d6039bf042d3b4 100644 (file)
--- 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 89698bac3d10918fcf8d371869f73dd96dfe9bd8..b13381dc722a58884d00e49bdebaf3dd5209f050 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -244,9 +244,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 d30b783a4c3415b2f4462c959d7b28eb462c47b8..30e20b865997b9626689e12c95ce81a4b378412e 100644 (file)
--- 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 282b7ae10c97fb300ebded0834f88c8ef73dc780..c166bf7c625675eddd4c36a3ca1f4a13f3eeaf1a 100644 (file)
--- 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 2bf0983e37e35c08eb016882dcd6c633068be297..bd325e130515cc94961e573e1b39d8d18beb7978 100644 (file)
--- 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 1057b936ced69651288de4321af0208bbc0f61e2..fb35f97ab30c7940b16ad7937e363560232a3a52 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -244,12 +244,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 ee22f4fc1bb5e4af3e5ffb07bbf9cdc10ef4867a..47a50bdaa650fe0583ba4dc41a6c5d90394364bc 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -238,11 +238,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 b4d7f171318b4940b5dd01bb45ae41b8af622c28..417d45b5824714a337d7bee8113b7d025c66fe41 100644 (file)
--- 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 af99e8b5cb48b4d05082d19d5a04d675e3e4e18e..e9a1cad0f7df7ad4012928455c5e2183b5dc4903 100644 (file)
--- 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 5fba35668b2d29ce6b7fe95734acef3714e4851a..5b31223b9ed2de2cd194afeea87bd359932d8f16 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -235,11 +235,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 d53657f91623ad2bd549b4c4d7720540ccf52f78..cb92bd9c08469fb1f8589e794dd7e34da81c72b2 100644 (file)
--- 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 7f1b5712677efc82a3bfab28a94fa771b11dcd62..7d5e926d1bc55566771f1c99acaf75a499359827 100644 (file)
--- 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 c6db88a4a2ff1d3c015035f922b3fa126d99d491..cbbe7d4e2fbe38fd537359739addee716047bc3c 100644 (file)
--- 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 05399092fec4e8939a3f32db489e9cda2bdb7978..2363912de1169408510097ec6df08444082a13ac 100644 (file)
--- 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 11b909b7dd88b3d2bd13caf00b67a25a29451931..7f4acbae34ccf37e4d094e16fbc44c2201c02003 100644 (file)
--- 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