diff options
| author | wdenk <wdenk> | 2003-03-06 00:02:04 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-03-06 00:02:04 +0000 |
| commit | 43d9616cffb4a130e1620e3e33fc9bc1bcabe399 (patch) | |
| tree | ed55479a108ed16258d81be3e37d0edd74520520 /tools/envcrc.c | |
| parent | 6069ff265362ef6239749b5f598b137f407b821e (diff) | |
* Patch by Robert Schwebel, 21 Jan 2003:LABEL_2003_03_06_0050
- Add support for Innokom board
- Don't complain if "install" fails
- README cleanup (remove duplicated lines)
- Update PXA header files
* Add documentation for existing POST code (doc/README.POST)
* Patch by Laudney Ren, 15 Jan 2003:
Fix handling of redundand environment in "tools/envcrc.c"
* Patch by Detlev Zundel, 28 Feb 2003:
Add bedbug support for 824x systems
* Add support for 16 MB flash configuration of TRAB board
* Patch by Erwin Rol, 27 Feb 2003:
Add support for RTEMS
* Add image information to README
* Fix dual PCMCIA slot support (when running with just one
slot populated)
* Add VFD type detection to trab board
* extend drivers/cs8900.c driver to synchronize ethaddr environment
variable with value in the EEPROM
Diffstat (limited to 'tools/envcrc.c')
| -rw-r--r-- | tools/envcrc.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c index c59f7d51d9b..19fe17c3e1a 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -36,15 +36,33 @@ # ifndef CFG_ENV_OFFSET # define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE) # endif +# if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND) +# define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND) +# endif # ifndef CFG_ENV_SIZE # define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # endif -# if ((CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \ - ((CFG_ENV_ADDR+CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN))) -# define ENV_IS_EMBEDDED +# if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND) +# define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE +# endif +# if (CFG_ENV_ADDR >= CFG_MONITOR_BASE) && \ + ((CFG_ENV_ADDR + CFG_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) +# define ENV_IS_EMBEDDED 1 +# endif +# if defined(CFG_ENV_ADDR_REDUND) || defined(CFG_ENV_OFFSET_REDUND) +# define CFG_REDUNDAND_ENVIRONMENT 1 # endif #endif /* CFG_ENV_IS_IN_FLASH */ +#ifdef CFG_REDUNDAND_ENVIRONMENT +# define ENV_HEADER_SIZE (sizeof(unsigned long) + 1) +#else +# define ENV_HEADER_SIZE (sizeof(unsigned long)) +#endif + +#define ENV_SIZE (CFG_ENV_SIZE - ENV_HEADER_SIZE) + + extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned int); #ifdef ENV_IS_EMBEDDED @@ -57,9 +75,8 @@ int main (int argc, char **argv) #ifdef ENV_IS_EMBEDDED int crc ; unsigned char *envptr = &environment, - *dataptr = envptr + sizeof(unsigned int) + 1; - unsigned int datasize = env_size - (dataptr - envptr) ; - + *dataptr = envptr + ENV_HEADER_SIZE; + unsigned int datasize = ENV_SIZE; crc = crc32(0, dataptr, datasize) ; |