rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[platform/kernel/u-boot.git] / board / cmc_pu2 / flash.c

diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c
index 846a2e6..0419d76 100644 (file)
--- a/board/cmc_pu2/flash.c
+++ b/board/cmc_pu2/flash.c
@@ -71,7 +71,7 @@ unsigned long flash_init (void)
                      flash_get_info(CFG_MONITOR_BASE));
 #endif
 
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* ENV protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
                      CFG_ENV_ADDR,
@@ -264,7 +264,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
        vu_short *addr = (vu_short *)(info->start[0]);
        int flag, prot, sect, ssect, l_sect;
-       ulong start, now, last;
+       ulong now, last;
 
        debug ("flash_erase: first: %d last: %d\n", s_first, s_last);
 
@@ -336,7 +336,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                        goto DONE;
 
                reset_timer_masked ();
-               last  = start;
+               last  = 0;
                addr = (vu_short *)(info->start[l_sect]);
                while ((addr[0] & 0x0080) != 0x0080) {
                        if ((now = get_timer_masked ()) > CFG_FLASH_ERASE_TOUT) {
@@ -432,7 +432,6 @@ printf ("write_buff 1: write_word_amd() rc=%d\n", rc);
  */
 static int write_word_amd (flash_info_t *info, vu_short *dest, ushort data)
 {
-       ulong start;
        int flag;
        vu_short *base;         /* first address in flash bank  */