diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-10-16 15:01:15 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:54:03 +0200 |
| commit | 6d0f6bcf337c5261c08fabe12982178c2c489d76 (patch) | |
| tree | ae13958ffa9c6b58c2ea97aac07a4ad2f04a350f /common/update.c | |
| parent | 71edc271816ec82cf0550dd6980be2da3cc2ad9e (diff) | |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common/update.c')
| -rw-r--r-- | common/update.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/update.c b/common/update.c index 938cc068166..75284748734 100644 --- a/common/update.c +++ b/common/update.c @@ -30,8 +30,8 @@ #error "CONFIG_FIT and CONFIG_OF_LIBFDT are required for auto-update feature" #endif -#if defined(CFG_NO_FLASH) -#error "CFG_NO_FLASH defined, but FLASH is required for auto-update feature" +#if defined(CONFIG_SYS_NO_FLASH) +#error "CONFIG_SYS_NO_FLASH defined, but FLASH is required for auto-update feature" #endif #include <command.h> @@ -120,12 +120,12 @@ static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) if (prot == 0) { saved_prot_info = - calloc(CFG_MAX_FLASH_BANKS * CFG_MAX_FLASH_SECT, 1); + calloc(CONFIG_SYS_MAX_FLASH_BANKS * CONFIG_SYS_MAX_FLASH_SECT, 1); if (!saved_prot_info) return 1; } - for (bank = 0; bank < CFG_MAX_FLASH_BANKS; ++bank) { + for (bank = 0; bank < CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { cnt = 0; info = &flash_info[bank]; @@ -134,7 +134,7 @@ static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) return 0; /* Point to current bank protection information */ - sp_info_ptr = saved_prot_info + (bank * CFG_MAX_FLASH_SECT); + sp_info_ptr = saved_prot_info + (bank * CONFIG_SYS_MAX_FLASH_SECT); /* * Adjust addr_first or addr_last if we are on bank boundary. @@ -159,7 +159,7 @@ static int update_flash_protect(int prot, ulong addr_first, ulong addr_last) /* Protect/unprotect sectors */ if (sp_info_ptr[i] == 1) { -#if defined(CFG_FLASH_PROTECTION) +#if defined(CONFIG_SYS_FLASH_PROTECTION) if (flash_real_protect(info, i, prot)) return 1; #else |