env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check

We have CONFIG_ENV_SIZE_IS_REDUND but don't really use it.  We have one
board where we can simply multiple CONFIG_ENV_SIZE by two for the same
result.  The other place where we could but were not previously using
this is for where env_internal.h checks for if we should set
ENV_IS_EMBEDDED.  This seems like the most likely use, historically, of
the variable, but it was not used.  Add logic to check for this now.

Cc: Wolfgang Denk <wd@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/env/Kconfig b/env/Kconfig
index 337787051df81bc82f105ee9ec4a792e84fa47ab..0b97af42b1c85ace41a8f12e97fde40a798a8798 100644 (file)
--- a/env/Kconfig
+++ b/env/Kconfig
@@ -132,7 +132,6 @@ config ENV_IS_IN_FLASH
           RAM, your target system will be dead.
 
          CONFIG_ENV_ADDR_REDUND
-         CONFIG_ENV_SIZE_REDUND
 
           These settings describe a second storage area used to hold
           a redundant copy of the environment data, so that there is
@@ -195,12 +194,6 @@ config ENV_IS_IN_MMC
          This value is also in units of bytes, but must also be aligned to
          an MMC sector boundary.
 
-         CONFIG_ENV_SIZE_REDUND (optional):
-
-         This value need not be set, even when CONFIG_ENV_OFFSET_REDUND is
-         set. If this value is set, it must be set to the same value as
-         CONFIG_ENV_SIZE.
-
 config ENV_IS_IN_NAND
        bool "Environment in a NAND device"
        depends on !CHAIN_OF_TRUST

diff --git a/env/flash.c b/env/flash.c
index 231a5fdf24d0038248759b420ea2747ceabb1593..b94ed2b04f8dd4b79f52de16ff22f35ad06738f9 100644 (file)
--- a/env/flash.c
+++ b/env/flash.c
@@ -28,11 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
 # endif
 #endif
 
-#if defined(CONFIG_ENV_SIZE_REDUND) && \
-       (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE)
-#error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE
-#endif
-
 /* TODO(sjg@chromium.org): Figure out all these special cases */
 #if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \
        !defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \

diff --git a/env/mmc.c b/env/mmc.c
index 9f1878def13a63d29cf9ba7e11dfd6f1686fe5ff..fee9f0674edcf4448a7b83b1c3c5bb445455c091 100644 (file)
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -22,11 +22,6 @@
 #define __STR(X) #X
 #define STR(X) __STR(X)
 
-#if defined(CONFIG_ENV_SIZE_REDUND) &&  \
-       (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
-#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CONFIG_ENV_OFFSET)

diff --git a/env/nand.c b/env/nand.c
index 9f3dc635cf1f0804d93f5ce0ec8748e00af92340..e631bf2fdab5adc162743be492d9a64e97c73e71 100644 (file)
--- a/env/nand.c
+++ b/env/nand.c
@@ -31,11 +31,6 @@
 #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
 #endif
 
-#if defined(CONFIG_ENV_SIZE_REDUND) && \
-       (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE)
-#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
-#endif
-
 #ifndef CONFIG_ENV_RANGE
 #define CONFIG_ENV_RANGE       CONFIG_ENV_SIZE
 #endif

diff --git a/env/sata.c b/env/sata.c
index 93697100815d080ae6c1e0bd81669dfa666314e0..8bfcc94306d3a2a8b12ba9f18379d901e0ce7628 100644 (file)
--- a/env/sata.c
+++ b/env/sata.c
@@ -16,7 +16,7 @@
 #include <sata.h>
 #include <search.h>
 
-#if defined(CONFIG_ENV_SIZE_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
+#if defined(CONFIG_ENV_OFFSET_REDUND)
 #error ENV REDUND not supported
 #endif
 

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 85d7ff6c521467240fd15c201ec012a6be12aa9c..e4a51d2d27e2c90d023fe593d0d2ecda91f18fc0 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -253,7 +253,6 @@
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */

diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h
index 4153d609be4a49541a0e3fcb902798d802d34791..fb09c2630f9c73b1201c1c37eca6fde34d634576 100644 (file)
--- a/include/configs/MPC8313ERDB_NAND.h
+++ b/include/configs/MPC8313ERDB_NAND.h
@@ -300,7 +300,6 @@
 #define CONFIG_ENV_OFFSET              (512 * 1024)
 #define CONFIG_ENV_SECT_SIZE   CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #define CONFIG_ENV_RANGE               (CONFIG_ENV_SECT_SIZE * 4)
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 7352e34b9c97f350e4753943f0d10d159ccd82d9..10293bd5f1b5f816dc48cec151fef39ecc049ced 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -276,7 +276,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index 2ae1069e4f8a3f806e942e2607785aa21ccd2d33..0193a6bfb736be07087b664fb8b0736bb71c5d64 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -331,7 +331,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 64172f36194e59ddcb5d645ab3352613b4b3e30f..fab355e1f2a4ebda24731d25a40fd2e151094b7b 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -83,7 +83,6 @@
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
 /* Offset of env Flash sector relative to CONFIG_SYS_FLASH_BASE */
 #define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 9bf5d9d3fd6ba56a073fd18753308d31ac569f5b..c8537e03139e1480143aaa663e5551256c329d30 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -191,7 +191,6 @@
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K (one sector) for env */
 #define CONFIG_ENV_SIZE                0x8000  /*  32K max size */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_LOADS_ECHO              1 /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1 /* allow baudrate change */

diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 40080f512b5327ee28e04935cc16bbe96dd3dd42..b2778a93c984df57eab11319e97a355b9cfd5044 100644 (file)
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -388,7 +388,6 @@
 #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT)
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #endif
 
 #elif defined(CONFIG_RAMBOOT_SDCARD)
@@ -408,7 +407,6 @@
 #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT)
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #endif
 
 #endif

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index f4a000f0200de07a5f18bcf66c8055ae3e5d8ba6..b34e48cb454e5109c598cdb55e6dd092076d990e 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -51,7 +51,6 @@
 #define CONFIG_HSMMC2_8BIT
 
 #define CONFIG_ENV_OFFSET_REDUND    0x9000 /* 36 kB */
-#define CONFIG_ENV_SIZE_REDUND      CONFIG_ENV_SIZE
 
 #ifndef CONFIG_SHC_ICT
 /*

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 044ce4467e581264994db74d2928df13b99c2af7..16a25740632121e45cc8139aa08a296f86db7991 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -71,7 +71,6 @@
 #define CONFIG_ENV_RANGE               0X00080000      /* 512kB */
 #define        CONFIG_ENV_OFFSET_REDUND        \
                (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)  /* +512kB */
-#define        CONFIG_ENV_SIZE_REDUND          CONFIG_ENV_SIZE /* 512kB */
 #define        CONFIG_FIRMWARE_OFFSET          0x00200000
 #define        CONFIG_FIRMWARE_SIZE            0x00080000      /* 512kB  */
 #define        CONFIG_KERNEL_OFFSET            0x00300000

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index 09de1c06ef67b056f307ba783c26f628587267fb..66b616c80bb1cc566f833cd52f2427a419a4b780 100644 (file)
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -35,7 +35,6 @@
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)
 #define CONFIG_ENV_SIZE                        (128 * 1024)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_RANGE               (384 * 1024)
 #define CONFIG_ENV_OFFSET              0x120000
 #define CONFIG_ENV_OFFSET_REDUND       \

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index c3ccceedca972a258241f6dadd3f1a70d8a7b8f1..dc611da035f42b4257de7b80f720a619168226df 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -75,7 +75,6 @@
                                 CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 
 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT       0

diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h
index 285e28b535e462be222343f917c987f550abdebe..2575a0de3f9386316baf07eb77df234716e3434c 100644 (file)
--- a/include/configs/bk4r1.h
+++ b/include/configs/bk4r1.h
@@ -263,7 +263,6 @@
 #define CONFIG_ENV_SECT_SIZE   (SZ_128K)
 #define CONFIG_ENV_SIZE                (SZ_8K)
 #define CONFIG_ENV_OFFSET      0x200000
-#define CONFIG_ENV_SIZE_REDUND (SZ_8K)
 #define CONFIG_ENV_OFFSET_REDUND       0x220000
 #endif
 

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 8774bde331b42fb18514fa2e20ec99b8857e0f49..7f4a204a3959deb96d65796f89381457b6c28425 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -59,7 +59,6 @@
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
 #endif
 
 #endif /* __BLANCHE_H */

diff --git a/include/configs/caddy2.h b/include/configs/caddy2.h
index 89deeac4e7dee510de795d4c68858a14ed6de761..2c4f2c5b730b4a7a048cae98cae6184438d35f1a 100644 (file)
--- a/include/configs/caddy2.h
+++ b/include/configs/caddy2.h
@@ -205,7 +205,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/condor.h b/include/configs/condor.h
index e3c146e8244d2966d74bb244dbb22e98e6e9a5bc..c84d127f49f6a6e77781108c8165efdfb9f48f37 100644 (file)
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -16,7 +16,6 @@
 #define CONFIG_BITBANGMII_MULTI
 
 /* Environment compatibility */
-#undef CONFIG_ENV_SIZE_REDUND
 #undef CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_SECT_SIZE   (256 * 1024)
 #define CONFIG_ENV_OFFSET      0x700000

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index d4bd88f5114b816c2a6f1ce6b7c4fbd2f0695abf..66a1b980eee9524609b45bf3ad866ee0d5e9983b 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -144,7 +144,6 @@
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_OFFSET_REDUND       \
        (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #endif
 
 #endif /* __DH_IMX6_CONFIG_H */

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 7b171489e381aed7a62df0e73d9f2aed6d813664..b353cffbfcc23c496b2af1a64fc687cd5ebbf460 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -354,7 +354,6 @@
 #define CONFIG_ENV_SECT_SIZE           (SZ_64K)
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #endif
 
 #define CONFIG_MXC_USB_PORTSC           (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/draco.h b/include/configs/draco.h
index ffeb3982b5560d4c6c6d2561fc5d119f93a81c0d..e566ccef2a19f8b200423ca143cac76551d19905 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -42,7 +42,6 @@
 
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND    0x2E0000
-#define CONFIG_ENV_SIZE_REDUND      0x2000
 #define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/eagle.h b/include/configs/eagle.h
index f0e4bcaa29df71d8ac87ec4112639f94708467ba..5f2fe42d2eb07d89370d620bb3102cae1617be43 100644 (file)
--- a/include/configs/eagle.h
+++ b/include/configs/eagle.h
@@ -16,7 +16,6 @@
 #define CONFIG_BITBANGMII_MULTI
 
 /* Environment compatibility */
-#undef CONFIG_ENV_SIZE_REDUND
 #undef CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_SECT_SIZE   (256 * 1024)
 #define CONFIG_ENV_OFFSET      0x700000

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index 84cbcdda93cad81e9c68b724f5181c3f4c011591..6526a83141f1fa588215f12a43f3a516a0c14b4c 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -183,7 +183,6 @@
 #define CONFIG_ENV_ADDR_REDUND         (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
 
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_USB_OHCI_EP93XX

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 726f8a500f9d8cd59848fba359eea346a2a852f4..8e09f73a887fd15e2b307363ecdcb14902bd369c 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -112,7 +112,6 @@
 
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND       0xB80000
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_RANGE               (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
 

diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index 4cd823fa363e618db6848dce34855b83494ff869..4b8b2dc4ad6511174317150e9c83c0a1d08fc0d9 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -117,7 +117,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + \
                                CONFIG_SYS_MONITOR_LEN)

diff --git a/include/configs/gardena-smart-gateway-mt7688.h b/include/configs/gardena-smart-gateway-mt7688.h
index 94c5b8daf349d06c315487b2d2ecaa8d8b0bf5d2..cfa7d1c674a0e74ffc37085f9112ef732e499a39 100644 (file)
--- a/include/configs/gardena-smart-gateway-mt7688.h
+++ b/include/configs/gardena-smart-gateway-mt7688.h
@@ -43,7 +43,6 @@
 #define CONFIG_ENV_SECT_SIZE           (64 << 10)
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 /*
  * Environment is right behind U-Boot in flash. Make sure U-Boot

diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 0ff48287ace20f97982e55852a01dcd85fd4ad13..8c01097245edfaee97baa848273e8e8a19fdf334 100644 (file)
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -60,7 +60,6 @@
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_LOADS_ECHO              /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index e543061bff6d630d2b3249dd0ccc9226c3e2101b..8b0f4d4d9019451193d6d370eda0f62674d76941 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -163,7 +163,6 @@
   #define CONFIG_ENV_SECT_SIZE           (128 * SZ_1K)
   #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
   #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + (512 * SZ_1K))
-  #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
   #define CONFIG_ENV_OFFSET            (512 * SZ_1K)
   #define CONFIG_ENV_SECT_SIZE         (64 * SZ_1K)

diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h
index 8fb321178fa178c83f4b8077a21daa6cacfd1ea4..cd59b840e9f9486b4c89c3f74e68215e750bec9a 100644 (file)
--- a/include/configs/hrcon.h
+++ b/include/configs/hrcon.h
@@ -357,7 +357,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #else
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #endif

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 43cb14c14e5c99206cce90fbf6af891ee8a9d200..71063653fadc0acb48ed12ab38cd935988a3fdea 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -227,7 +227,6 @@
                                + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SIZE                0x20000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_NETDEV                  eth1
 #define CONFIG_HOSTNAME                "ids8313"

diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 730e874c9f0274a99474378eabf607a4e51cc83d..a2d0ade0151f36299863ca2318aed82361101c93 100644 (file)
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -98,7 +98,6 @@
 #define CONFIG_ENV_SIZE                CONFIG_ENV_SECT_SIZE
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 /*
  * Ethernet

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index c06143c68b55a985c4114303f17ba6bab515806d..a9899fe4591ec83e09cc144ed4fc8e17d42bb3cc 100644 (file)
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -117,7 +117,6 @@
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else /* CFG_SYS_RAMBOOT */
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 64c968b63ba4f029ee6f465f0173128388b01cc0..63fa6675ff9289d9d61568d10ec91fe553aa7e7a 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -155,7 +155,6 @@ int get_scl(void);
 #define CONFIG_ENV_SIZE                        (0x2000 - CONFIG_ENV_OFFSET)
 #define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
 #define CONFIG_ENV_OFFSET_REDUND       0x2000 /* no bracets! */
-#define CONFIG_ENV_SIZE_REDUND         (CONFIG_ENV_SIZE)
 #endif
 
 #define KM_FLASH_GPIO_PIN      16

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index ff564b27ec832b83b3dff2a482fa954cfbac12c6..85224c3f46ae64311aebec685fa059cc1a627d65 100644 (file)
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -99,7 +99,6 @@
 /* environment organization */
 #define CONFIG_ENV_OFFSET      (SZ_1M)
 #define CONFIG_ENV_SIZE        (SZ_8K)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND        (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MMC_ENV_DEV 0
 

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 113e84456d388548ee06e46a84920ca718b34057..701bf2a597baead1d9cb91ce6c0648da76cfab75 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -72,7 +72,6 @@
 #define CONFIG_MXC_NAND_HWECC
 
 /* Environment is in NAND */
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)
 #define CONFIG_ENV_RANGE               (4 * CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_OFFSET              (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index c75519c1958fd344979f3551e555d7f5a032d325..50afc7c6080809f204a677a8553e0d3a3323c162 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -252,6 +252,5 @@
 #define CONFIG_ENV_ADDR        (CONFIG_SYS_FLASH_BASE + 0x40000)
 
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + 0x60000)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #endif                        /* __CONFIG_H * */

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index 3ce4b705b7073c034034fd9e0270de4d2cb0d95b..5a8546838fe3979def97bb9ca2bbf4d0f90e10e8 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -232,7 +232,6 @@
 #define CONFIG_ENV_SECT_SIZE   0x20000 /* 128K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 2fad2c7a84923ea3f16e792ef23d9f97e85f0701..7e7637ebecd82f9d86ab5b563f631aea937cf462 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -34,7 +34,6 @@
 
 /* Environment is in NAND */
 #if defined(CONFIG_CMD_NAND) && defined(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)
 #define CONFIG_ENV_OFFSET              0x300000

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index e153dfb1992231599d511fe39bd90b412fa06ad2..4ec36193c0b237f178c58b0486a04c2ed3c32966 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -133,7 +133,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + \
                                CONFIG_SYS_MONITOR_LEN)

diff --git a/include/configs/novena.h b/include/configs/novena.h
index cdc437c4925fa232324e308585d64aa3aff753ca..fff2396e98f293495b946c8a0a527c8626b00712 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -28,7 +28,6 @@
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_OFFSET              (512 * 1024)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND       \
                (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
 #endif

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index fb8f3c8609c0187840a69ab0260328dd23dc1b04..b68d205bfb3a2942220ee5159c78e2fd8ab8985c 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -178,7 +178,6 @@
 #define CONFIG_ENV_SECT_SIZE           (SZ_128K)
 #define CONFIG_ENV_SIZE                        (SZ_8K)
 #define CONFIG_ENV_OFFSET              0xA0000
-#define CONFIG_ENV_SIZE_REDUND         (SZ_8K)
 #define CONFIG_ENV_OFFSET_REDUND       0xC0000
 #endif
 

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index b9f5ad326082c3bd1a261946528e5566b96d6169..6c4a619433b6415a24b05a00e1203df443b923c5 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -78,7 +78,6 @@
 #define CONFIG_ENV_SECT_SIZE           (64 * SZ_1K)
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (0x1E0000)

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 9a169351a3a05adc7c72dee6b3097968949c41e6..a4d0e4898a482a05ff38a3c05bb80efb0b4dd9d7 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -79,7 +79,6 @@
 #define CONFIG_ENV_SECT_SIZE           (64 * SZ_1K)
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (0x1E0000)

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index 1b57e9931f675db9c558267b751dd2f29d671486..58e590a1fd3bfa04c39c7f7f50f79399dd455f56 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -78,7 +78,6 @@
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + (512 << 10))
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #else /* CONFIG_CMD_NAND */
 

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index c69535aa6dcbf3f31ab130270f391b233673551c..c34b68a374f7e7c1b82a7d4251cb7b3545a0d5e3 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -47,7 +47,6 @@
 
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND       0x2E0000
-#define CONFIG_ENV_SIZE_REDUND         0x2000
 #define CONFIG_ENV_RANGE               (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index e940a8b70a3b3ab72187688ffdf355fd136cccf6..3a763336ed176a6fc36b6f63b94b0a7bf8113cf6 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -43,7 +43,6 @@
 #define CONFIG_ENV_SECT_SIZE   (256 * 1024)
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
 
 /* SF MTD */
 #ifdef CONFIG_SPL_BUILD

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 95bd97c0ec3a19e1463b6f592eae534308f7580d..0f7a00f95782e114ba9fe47e793116ed5420dc28 100644 (file)
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -54,7 +54,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_SECT_SIZE   (128 * 1024)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "bootm_size=0x10000000\0"

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index d2053cc0597a8bf85f2f4c99766d77d636a6c5ea..01d480288578d02850f327d1d6b45918d0ca26a6 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -229,7 +229,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index cd7f51c7ced0cab2e9bf42d08cae796195d945fd..02c5143491a662c648c3896cd84359cc641fd453 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -67,7 +67,6 @@
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                "netboot=bootp; bootm\0"
 

diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index 6b00bd7d906aa9b1d859a99c64111c639dfde972..ae76254589b3a908a89e23648f3f7a5abd779999 100644 (file)
--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -67,7 +67,6 @@
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                "netboot=bootp; bootm\0"
 

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index f1955a16b927c530bb8d9aff354a759547a8f9ed..04b6879644b79a0e3264c9d95a67a0764f0cfe39 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -79,7 +79,6 @@
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)
 #define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_EXTRA_ENV_SETTINGS                              \
                "netboot=bootp; bootm\0"
 

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 10961b14bae9b5b04898495ef0c70abd9b3b6726..620cf5af5009834fd638e573fa4c0498b24fa829 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -60,7 +60,6 @@
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
 /* Offset of env Flash sector relative to CONFIG_SYS_FLASH_BASE */
 #define CONFIG_ENV_OFFSET              (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
 
 /* Clock */

diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index e1a7d724c1612c6ad9ba3dbc7aabed7058c35ef9..b2ca7b1a7257cf7434202e9abef3f8378eabbd00 100644 (file)
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -58,7 +58,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + \
                                                CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index abde883487e8c624b99a9354ee10b70c3b40de6f..5cc12419a692e108de95c8d115cf119331f32852 100644 (file)
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -195,7 +195,6 @@
                "fi\0"                                                  \
                "socfpga_legacy_reset_compat=1\0"
 
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (64 * 1024)
 #define CONFIG_ENV_OFFSET              0x100000
 #define CONFIG_ENV_OFFSET_REDUND       \

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index a03005902fa89d64f651894b6a17fcd33170f4a4..f5f3316b9030f9db272c6beaa4e137d0565fc7d3 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -192,7 +192,6 @@
                                CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE                0x4000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */

diff --git a/include/configs/strider.h b/include/configs/strider.h
index e3d64e52aa13431c35c006d91c45031f5c8f149b..d270d8a2dd4f9cdf4175a02b31d4aad86097280a 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -390,7 +390,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_ENV_SECT_SIZE   0x10000 /* 64K(one sector) for env */
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 #else
 #define CONFIG_ENV_SIZE                0x2000          /* 8KB */
 #endif

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 121de2bd2452c4ff0f4fd9db47273a3b73e155db..69819da492fdaf70e4d3b6ff6b132f686f42dbc9 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -114,7 +114,6 @@
 #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
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       0x4020f800

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 569df9e4d8d715b93afb458a8a59026e3d86e54e..954b063e293a565d37336671c4d99183ac3ad7c4 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -40,7 +40,6 @@
 
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND    0x2E0000
-#define CONFIG_ENV_SIZE_REDUND      0x2000
 #define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index c24d657dba7d9c51d3e08c196bc5c111fba6c228..64ec06da85991deff039838ad2c48a07dbb4678a 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -149,7 +149,6 @@
 #define CONFIG_ENV_SECT_SIZE           (128 << 10)
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + (512 << 10))
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #else /* CONFIG_CMD_NAND */
 

diff --git a/include/configs/vcoreiii.h b/include/configs/vcoreiii.h
index 7ed952435937a954c89673cea0d1ff9b0d1a6bdd..6ff68cd6a0856c7e5477a04d3e0690b9519da3d6 100644 (file)
--- a/include/configs/vcoreiii.h
+++ b/include/configs/vcoreiii.h
@@ -30,7 +30,6 @@
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 #define CONFIG_ENV_SECT_SIZE           (256 * 1024)
 
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_OFFSET_REDUND      (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 
 #endif

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 571071593a12ffef47aef9504c1e827ae16e418d..890f347b43956aed1c0ecf6693f5ec6b83b98fe5 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -134,7 +134,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 #endif /* CONFIG_ENV_IS_IN_FLASH */
 #endif /* CONFIG_VCT_NOR */
 

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index 66f771d818f1fc5f71cf614edbae590f71b7687d..2608b2b232206d77653ecd16712260ed588d2875 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -202,7 +202,6 @@
 /* Address and size of Redundant Environment Sector */
 #define CONFIG_ENV_OFFSET_REDUND       \
                        (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 33f06c00b1d8c5f57d4bd8ffa12d88d827504e85..6672930fb39c4d552f3ab07506c091ee76289ad1 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -88,7 +88,6 @@
 #define CONFIG_ENV_OFFSET              (8 * SZ_64K)
 #define CONFIG_ENV_SIZE                        SZ_8K
 #define CONFIG_ENV_OFFSET_REDUND       (9 * SZ_64K)
-#define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0 /* USDHC4 eMMC */

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index a4f2af4962de14de2ae05284ed470754c1ceb0c1..74e8d3925bf2d7b905a7ad521867865a137ae024 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -205,7 +205,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 #else
        #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 5ad3dab51c4a952bec80096530f692142565305c..d7c4a6f1f4d83d4dce65f86c47dbf160dd93dd40 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -124,7 +124,6 @@
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
 
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + \
                                CONFIG_SYS_MONITOR_LEN)

diff --git a/include/configs/x600.h b/include/configs/x600.h
index d4bbdcdb134070b9790f19a1772eac11209434d3..f6779213a8963ca889bd81ffbf21601458508738 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -93,7 +93,6 @@
 #define CONFIG_ENV_SIZE                                0x02000
 #define CONFIG_ENV_ADDR_REDUND                 (CONFIG_ENV_ADDR + \
                                                 CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND                 (CONFIG_ENV_SIZE)
 
 /* Miscellaneous configurable options */
 #define CONFIG_BOOT_PARAMS_ADDR                        0x00000100

diff --git a/include/env_internal.h b/include/env_internal.h
index d520e6a55b5c9fa38536894869f565352e2e0c18..b8158c0e0bc5c910017e626398f1904cf52e1fdb 100644 (file)
--- a/include/env_internal.h
+++ b/include/env_internal.h
@@ -50,8 +50,11 @@
 # else
 #  error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined"
 # endif
-# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
-#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE
+# if   defined(CONFIG_ENV_ADDR_REDUND) && \
+       ((CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) &&                \
+       (CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE) <=           \
+       (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
+#  define ENV_IS_EMBEDDED
 # endif
 # if   (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) &&         \
        (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <=                  \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b680c554c15aba73c9dd041839f9fd5affb9f4bb..d73e433cffb1e23faf98d5ef4e1229bdca7d7c90 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -454,7 +454,6 @@ CONFIG_ENV_SETTINGS_NAND_V2
 CONFIG_ENV_SETTINGS_V1
 CONFIG_ENV_SETTINGS_V2
 CONFIG_ENV_SIZE_FLEX
-CONFIG_ENV_SIZE_REDUND
 CONFIG_ENV_SROM_BANK
 CONFIG_ENV_TOTAL_SIZE
 CONFIG_ENV_UBIFS_OPTION

diff --git a/tools/envcrc.c b/tools/envcrc.c
index 95776828289e8cb053e2502a7f0d920f9e36c743..4b3b828af0fd160084f62be47fcee6341bc4fe3b 100644 (file)
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -33,9 +33,6 @@
 # ifndef  CONFIG_ENV_SIZE
 #  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
-# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND)
-#  define CONFIG_ENV_SIZE_REDUND       CONFIG_ENV_SIZE
-# endif
 # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
      ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
 #  define ENV_IS_EMBEDDED