Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash

This commit is contained in:
Wolfgang Denk 2009-03-23 10:29:19 +01:00
commit 181c3e46f8

View file

@ -2009,7 +2009,9 @@ unsigned long flash_init (void)
#endif #endif
#ifdef CONFIG_SYS_FLASH_PROTECTION #ifdef CONFIG_SYS_FLASH_PROTECTION
char *s = getenv("unlock"); /* read environment from EEPROM */
char s[64];
getenv_r ("unlock", s, sizeof(s));
#endif #endif
#define BANK_BASE(i) (((phys_addr_t [CFI_MAX_FLASH_BANKS])CONFIG_SYS_FLASH_BANKS_LIST)[i]) #define BANK_BASE(i) (((phys_addr_t [CFI_MAX_FLASH_BANKS])CONFIG_SYS_FLASH_BANKS_LIST)[i])