leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: Remove useless CONFIG_ENV_SIZE_REDUND and fix ENV_IS_REDUND check

Browse Source 
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>
This commit is contained in:
Tom Rini 2019-11-18 20:02:07 -05:00
parent 3eee45d936
commit a8992e788a
71 changed files with 6 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
env/Kconfig vendored
View File

@ -132,7 +132,6 @@ config ENV_IS_IN_FLASH
RAM, your target system will be dead. RAM, your target system will be dead.
CONFIG_ENV_ADDR_REDUND CONFIG_ENV_ADDR_REDUND
CONFIG_ENV_SIZE_REDUND
These settings describe a second storage area used to hold These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is 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 This value is also in units of bytes, but must also be aligned to
an MMC sector boundary. 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 config ENV_IS_IN_NAND
bool "Environment in a NAND device" bool "Environment in a NAND device"
depends on !CHAIN_OF_TRUST depends on !CHAIN_OF_TRUST

5
env/flash.c vendored
View File

@ -28,11 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
# endif # endif
#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 */ /* TODO(sjg@chromium.org): Figure out all these special cases */
#if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \ #if (!defined(CONFIG_MICROBLAZE) && !defined(CONFIG_ARCH_ZYNQ) && \
!defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \ !defined(CONFIG_TARGET_MCCMON6) && !defined(CONFIG_TARGET_X600) && \

5
env/mmc.c vendored
View File

@ -22,11 +22,6 @@
#define __STR(X) #X #define __STR(X) #X
#define STR(X) __STR(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; DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_ENV_OFFSET) #if !defined(CONFIG_ENV_OFFSET)

5
env/nand.c vendored
View File

@ -31,11 +31,6 @@
#error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND #error CONFIG_ENV_OFFSET_REDUND must have CONFIG_CMD_SAVEENV & CONFIG_CMD_NAND
#endif #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 #ifndef CONFIG_ENV_RANGE
#define CONFIG_ENV_RANGE CONFIG_ENV_SIZE #define CONFIG_ENV_RANGE CONFIG_ENV_SIZE
#endif #endif

2
env/sata.c vendored
View File

@ -16,7 +16,7 @@
#include <sata.h> #include <sata.h>
#include <search.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 #error ENV REDUND not supported
#endif #endif

1
include/configs/MPC8308RDB.h
View File

@ -253,7 +253,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_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_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

1
include/configs/MPC8313ERDB_NAND.h
View File

@ -300,7 +300,6 @@
#define CONFIG_ENV_OFFSET (512 * 1024) #define CONFIG_ENV_OFFSET (512 * 1024)
#define CONFIG_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_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_RANGE (CONFIG_ENV_SECT_SIZE * 4)
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)

1
include/configs/MPC8349EMDS.h
View File

@ -276,7 +276,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else #else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/MPC8349EMDS_SDRAM.h
View File

@ -331,7 +331,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else #else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/MigoR.h
View File

@ -83,7 +83,6 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
/* Offset of env Flash sector relative to CONFIG_SYS_FLASH_BASE */ /* 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_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
/* Board Clock */ /* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333 #define CONFIG_SYS_CLK_FREQ 33333333

1
include/configs/TQM834x.h
View File

@ -191,7 +191,6 @@
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) for env */
#define CONFIG_ENV_SIZE 0x8000 /* 32K max size */ #define CONFIG_ENV_SIZE 0x8000 /* 32K max size */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_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_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

2
include/configs/UCP1020.h
View File

@ -388,7 +388,6 @@
#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT)
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#endif #endif
#elif defined(CONFIG_RAMBOOT_SDCARD) #elif defined(CONFIG_RAMBOOT_SDCARD)
@ -408,7 +407,6 @@
#if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT) #if defined(CONFIG_SYS_REDUNDAND_ENVIRONMENT)
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#endif #endif
#endif #endif

1
include/configs/am335x_shc.h
View File

@ -51,7 +51,6 @@
#define CONFIG_HSMMC2_8BIT #define CONFIG_HSMMC2_8BIT
#define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */ #define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#ifndef CONFIG_SHC_ICT #ifndef CONFIG_SHC_ICT
/* /*

1
include/configs/apf27.h
View File

@ -71,7 +71,6 @@
#define CONFIG_ENV_RANGE 0X00080000 /* 512kB */ #define CONFIG_ENV_RANGE 0X00080000 /* 512kB */
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */ (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE) /* +512kB */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE /* 512kB */
#define CONFIG_FIRMWARE_OFFSET 0x00200000 #define CONFIG_FIRMWARE_OFFSET 0x00200000
#define CONFIG_FIRMWARE_SIZE 0x00080000 /* 512kB */ #define CONFIG_FIRMWARE_SIZE 0x00080000 /* 512kB */
#define CONFIG_KERNEL_OFFSET 0x00300000 #define CONFIG_KERNEL_OFFSET 0x00300000

1
include/configs/apx4devkit.h
View File

@ -35,7 +35,6 @@
#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND) #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_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_RANGE (384 * 1024)
#define CONFIG_ENV_OFFSET 0x120000 #define CONFIG_ENV_OFFSET 0x120000
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \

1
include/configs/armadillo-800eva.h
View File

@ -75,7 +75,6 @@
CONFIG_SYS_MONITOR_LEN) CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
/* SH Ether */ /* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0 #define CONFIG_SH_ETHER_USE_PORT 0

1
include/configs/bk4r1.h
View File

@ -263,7 +263,6 @@
#define CONFIG_ENV_SECT_SIZE (SZ_128K) #define CONFIG_ENV_SECT_SIZE (SZ_128K)
#define CONFIG_ENV_SIZE (SZ_8K) #define CONFIG_ENV_SIZE (SZ_8K)
#define CONFIG_ENV_OFFSET 0x200000 #define CONFIG_ENV_OFFSET 0x200000
#define CONFIG_ENV_SIZE_REDUND (SZ_8K)
#define CONFIG_ENV_OFFSET_REDUND 0x220000 #define CONFIG_ENV_OFFSET_REDUND 0x220000
#endif #endif

1
include/configs/blanche.h
View File

@ -59,7 +59,6 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
#endif #endif
#endif /* __BLANCHE_H */ #endif /* __BLANCHE_H */

1
include/configs/caddy2.h
View File

@ -205,7 +205,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else #else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/condor.h
View File

@ -16,7 +16,6 @@
#define CONFIG_BITBANGMII_MULTI #define CONFIG_BITBANGMII_MULTI
/* Environment compatibility */ /* Environment compatibility */
#undef CONFIG_ENV_SIZE_REDUND
#undef CONFIG_ENV_SECT_SIZE #undef CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SECT_SIZE (256 * 1024)
#define CONFIG_ENV_OFFSET 0x700000 #define CONFIG_ENV_OFFSET 0x700000

1
include/configs/dh_imx6.h
View File

@ -144,7 +144,6 @@
#define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#endif #endif
#endif /* __DH_IMX6_CONFIG_H */ #endif /* __DH_IMX6_CONFIG_H */

1
include/configs/display5.h
View File

@ -354,7 +354,6 @@
#define CONFIG_ENV_SECT_SIZE (SZ_64K) #define CONFIG_ENV_SECT_SIZE (SZ_64K)
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#endif #endif
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

1
include/configs/draco.h
View File

@ -42,7 +42,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD

1
include/configs/eagle.h
View File

@ -16,7 +16,6 @@
#define CONFIG_BITBANGMII_MULTI #define CONFIG_BITBANGMII_MULTI
/* Environment compatibility */ /* Environment compatibility */
#undef CONFIG_ENV_SIZE_REDUND
#undef CONFIG_ENV_SECT_SIZE #undef CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SECT_SIZE (256 * 1024)
#define CONFIG_ENV_OFFSET 0x700000 #define CONFIG_ENV_OFFSET 0x700000

1
include/configs/edb93xx.h
View File

@ -183,7 +183,6 @@
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 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_NEW
#define CONFIG_USB_OHCI_EP93XX #define CONFIG_USB_OHCI_EP93XX

1
include/configs/etamin.h
View File

@ -112,7 +112,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0xB80000 #define CONFIG_ENV_OFFSET_REDUND 0xB80000
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)

1
include/configs/flea3.h
View File

@ -117,7 +117,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #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 + \ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN) CONFIG_SYS_MONITOR_LEN)

1
include/configs/gardena-smart-gateway-mt7688.h
View File

@ -43,7 +43,6 @@
#define CONFIG_ENV_SECT_SIZE (64 << 10) #define CONFIG_ENV_SECT_SIZE (64 << 10)
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
/* /*
* Environment is right behind U-Boot in flash. Make sure U-Boot * Environment is right behind U-Boot in flash. Make sure U-Boot

1
include/configs/gazerbeam.h
View File

@ -60,7 +60,6 @@
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CONFIG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_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 /* echo on for serial download */ #define CONFIG_LOADS_ECHO /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */

1
include/configs/gw_ventana.h
View File

@ -163,7 +163,6 @@
#define CONFIG_ENV_SECT_SIZE (128 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (128 * SZ_1K)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + (512 * SZ_1K)) #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) #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
#define CONFIG_ENV_OFFSET (512 * SZ_1K) #define CONFIG_ENV_OFFSET (512 * SZ_1K)
#define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K)

1
include/configs/hrcon.h
View File

@ -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_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#else #else
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#endif #endif

1
include/configs/ids8313.h
View File

@ -227,7 +227,6 @@
+ CONFIG_SYS_MONITOR_LEN) + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) #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_NETDEV eth1
#define CONFIG_HOSTNAME "ids8313" #define CONFIG_HOSTNAME "ids8313"

1
include/configs/imx27lite-common.h
View File

@ -98,7 +98,6 @@
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
/* /*
* Ethernet * Ethernet

1
include/configs/km/km-mpc83xx.h
View File

@ -117,7 +117,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else /* CFG_SYS_RAMBOOT */ #else /* CFG_SYS_RAMBOOT */
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/km/km_arm.h
View File

@ -155,7 +155,6 @@ int get_scl(void);
#define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET)
#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */ #define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
#define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */ #define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#endif #endif
#define KM_FLASH_GPIO_PIN 16 #define KM_FLASH_GPIO_PIN 16

1
include/configs/kp_imx53.h
View File

@ -99,7 +99,6 @@
/* environment organization */ /* environment organization */
#define CONFIG_ENV_OFFSET (SZ_1M) #define CONFIG_ENV_OFFSET (SZ_1M)
#define CONFIG_ENV_SIZE (SZ_8K) #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_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0

1
include/configs/m53menlo.h
View File

@ -72,7 +72,6 @@
#define CONFIG_MXC_NAND_HWECC #define CONFIG_MXC_NAND_HWECC
/* Environment is in NAND */ /* Environment is in NAND */
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_OFFSET (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */ #define CONFIG_ENV_OFFSET (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */

1
include/configs/mccmon6.h
View File

@ -252,6 +252,5 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000)
#define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + 0x60000) #define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + 0x60000)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#endif /* __CONFIG_H * */ #endif /* __CONFIG_H * */

1
include/configs/mpc8308_p1m.h
View File

@ -232,7 +232,6 @@
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_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_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

1
include/configs/mx28evk.h
View File

@ -34,7 +34,6 @@
/* Environment is in NAND */ /* Environment is in NAND */
#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_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_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_RANGE (512 * 1024) #define CONFIG_ENV_RANGE (512 * 1024)
#define CONFIG_ENV_OFFSET 0x300000 #define CONFIG_ENV_OFFSET 0x300000

1
include/configs/mx35pdk.h
View File

@ -133,7 +133,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #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 + \ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN) CONFIG_SYS_MONITOR_LEN)

1
include/configs/novena.h
View File

@ -28,7 +28,6 @@
#ifdef CONFIG_CMD_MMC #ifdef CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_OFFSET (512 * 1024) #define CONFIG_ENV_OFFSET (512 * 1024)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
#endif #endif

1
include/configs/pcm052.h
View File

@ -178,7 +178,6 @@
#define CONFIG_ENV_SECT_SIZE (SZ_128K) #define CONFIG_ENV_SECT_SIZE (SZ_128K)
#define CONFIG_ENV_SIZE (SZ_8K) #define CONFIG_ENV_SIZE (SZ_8K)
#define CONFIG_ENV_OFFSET 0xA0000 #define CONFIG_ENV_OFFSET 0xA0000
#define CONFIG_ENV_SIZE_REDUND (SZ_8K)
#define CONFIG_ENV_OFFSET_REDUND 0xC0000 #define CONFIG_ENV_OFFSET_REDUND 0xC0000
#endif #endif

1
include/configs/pcm058.h
View File

@ -78,7 +78,6 @@
#define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K)
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#ifdef CONFIG_ENV_IS_IN_NAND #ifdef CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (0x1E0000) #define CONFIG_ENV_OFFSET (0x1E0000)

1
include/configs/pfla02.h
View File

@ -79,7 +79,6 @@
#define CONFIG_ENV_SECT_SIZE (64 * SZ_1K) #define CONFIG_ENV_SECT_SIZE (64 * SZ_1K)
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#ifdef CONFIG_ENV_IS_IN_NAND #ifdef CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET (0x1E0000) #define CONFIG_ENV_OFFSET (0x1E0000)

1
include/configs/platinum.h
View File

@ -78,7 +78,6 @@
#define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SECT_SIZE (128 << 10)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + (512 << 10)) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + (512 << 10))
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#else /* CONFIG_CMD_NAND */ #else /* CONFIG_CMD_NAND */

1
include/configs/rastaban.h
View File

@ -47,7 +47,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD

1
include/configs/rcar-gen2-common.h
View File

@ -43,7 +43,6 @@
#define CONFIG_ENV_SECT_SIZE (256 * 1024) #define CONFIG_ENV_SECT_SIZE (256 * 1024)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_SYS_MONITOR_LEN)
/* SF MTD */ /* SF MTD */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD

1
include/configs/rcar-gen3-common.h
View File

@ -54,7 +54,6 @@
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SECT_SIZE (128 * 1024)
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootm_size=0x10000000\0" "bootm_size=0x10000000\0"

1
include/configs/sbc8349.h
View File

@ -229,7 +229,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else #else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/sh7752evb.h
View File

@ -67,7 +67,6 @@
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netboot=bootp; bootm\0" "netboot=bootp; bootm\0"

1
include/configs/sh7753evb.h
View File

@ -67,7 +67,6 @@
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netboot=bootp; bootm\0" "netboot=bootp; bootm\0"

1
include/configs/sh7757lcr.h
View File

@ -79,7 +79,6 @@
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR) #define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR)
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_SIZE (CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"netboot=bootp; bootm\0" "netboot=bootp; bootm\0"

1
include/configs/sh7763rdp.h
View File

@ -60,7 +60,6 @@
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE)) #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (1 * CONFIG_ENV_SECT_SIZE))
/* Offset of env Flash sector relative to CONFIG_SYS_FLASH_BASE */ /* 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_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)) #define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
/* Clock */ /* Clock */

1
include/configs/sksimx6.h
View File

@ -58,7 +58,6 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
CONFIG_ENV_SIZE) CONFIG_ENV_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
/* Default environment */ /* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

1
include/configs/socfpga_vining_fpga.h
View File

@ -195,7 +195,6 @@
"fi\0" \ "fi\0" \
"socfpga_legacy_reset_compat=1\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_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_OFFSET 0x100000
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \

1
include/configs/socrates.h
View File

@ -192,7 +192,6 @@
CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_ENV_SIZE 0x4000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_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_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

1
include/configs/strider.h
View File

@ -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_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#else #else
#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_SIZE 0x2000 /* 8KB */
#endif #endif

1
include/configs/tam3517-common.h
View File

@ -114,7 +114,6 @@
#define CONFIG_ENV_ADDR 0x180000 #define CONFIG_ENV_ADDR 0x180000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
2 * CONFIG_SYS_ENV_SECT_SIZE) 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_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 #define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800

1
include/configs/thuban.h
View File

@ -40,7 +40,6 @@
/* Define own nand partitions */ /* Define own nand partitions */
#define CONFIG_ENV_OFFSET_REDUND 0x2E0000 #define CONFIG_ENV_OFFSET_REDUND 0x2E0000
#define CONFIG_ENV_SIZE_REDUND 0x2000
#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE) #define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD

1
include/configs/titanium.h
View File

@ -149,7 +149,6 @@
#define CONFIG_ENV_SECT_SIZE (128 << 10) #define CONFIG_ENV_SECT_SIZE (128 << 10)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + (512 << 10)) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + (512 << 10))
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#else /* CONFIG_CMD_NAND */ #else /* CONFIG_CMD_NAND */

1
include/configs/vcoreiii.h
View File

@ -30,7 +30,6 @@
#define CONFIG_ENV_SIZE (8 * 1024) #define CONFIG_ENV_SIZE (8 * 1024)
#define CONFIG_ENV_SECT_SIZE (256 * 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) #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
#endif #endif

1
include/configs/vct.h
View File

@ -134,7 +134,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #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_ENV_IS_IN_FLASH */
#endif /* CONFIG_VCT_NOR */ #endif /* CONFIG_VCT_NOR */

1
include/configs/ve8313.h
View File

@ -202,7 +202,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND \ #define CONFIG_ENV_OFFSET_REDUND \
(CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE) (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_LOADS_ECHO 1 /* echo on for serial download */
#define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change */

1
include/configs/vining_2000.h
View File

@ -88,7 +88,6 @@
#define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_OFFSET (8 * SZ_64K)
#define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_SIZE SZ_8K
#define CONFIG_ENV_OFFSET_REDUND (9 * SZ_64K) #define CONFIG_ENV_OFFSET_REDUND (9 * SZ_64K)
#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
#ifdef CONFIG_ENV_IS_IN_MMC #ifdef CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC4 eMMC */ #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC4 eMMC */

1
include/configs/vme8349.h
View File

@ -205,7 +205,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#else #else
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000) #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - 0x1000)

1
include/configs/woodburn_common.h
View File

@ -124,7 +124,6 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #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 + \ #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + \
CONFIG_SYS_MONITOR_LEN) CONFIG_SYS_MONITOR_LEN)

1
include/configs/x600.h
View File

@ -93,7 +93,6 @@
#define CONFIG_ENV_SIZE 0x02000 #define CONFIG_ENV_SIZE 0x02000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + \ #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + \
CONFIG_ENV_SECT_SIZE) CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#define CONFIG_BOOT_PARAMS_ADDR 0x00000100 #define CONFIG_BOOT_PARAMS_ADDR 0x00000100

7
include/env_internal.h
View File

@ -50,8 +50,11 @@
# else # else
# error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined" # error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined"
# endif # endif
# if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) # if defined(CONFIG_ENV_ADDR_REDUND) && \
# define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE ((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 # endif
# if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \ (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \

1
scripts/config_whitelist.txt
View File

@ -454,7 +454,6 @@ CONFIG_ENV_SETTINGS_NAND_V2
CONFIG_ENV_SETTINGS_V1 CONFIG_ENV_SETTINGS_V1
CONFIG_ENV_SETTINGS_V2 CONFIG_ENV_SETTINGS_V2
CONFIG_ENV_SIZE_FLEX CONFIG_ENV_SIZE_FLEX
CONFIG_ENV_SIZE_REDUND
CONFIG_ENV_SROM_BANK CONFIG_ENV_SROM_BANK
CONFIG_ENV_TOTAL_SIZE CONFIG_ENV_TOTAL_SIZE
CONFIG_ENV_UBIFS_OPTION CONFIG_ENV_UBIFS_OPTION

3
tools/envcrc.c
View File

@ -33,9 +33,6 @@
# ifndef CONFIG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # 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) && \ # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \
((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN))
# define ENV_IS_EMBEDDED # define ENV_IS_EMBEDDED