at91: Enabeling USB host on meesc board

[karo-tx-uboot.git] / common / flash.c

diff --git a/common/flash.c b/common/flash.c
index a64bc985299500bcd2f995ba14740c9af939bfdd..683978e473c79303b26143304bd19128144d4c39 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -26,7 +26,7 @@
 #include <common.h>
 #include <flash.h>
 
-#if !defined(CFG_NO_FLASH)
+#if !defined(CONFIG_SYS_NO_FLASH)
 
 extern flash_info_t  flash_info[]; /* info for FLASH chips */
 
@@ -43,20 +43,23 @@ extern flash_info_t  flash_info[]; /* info for FLASH chips */
 void
 flash_protect (int flag, ulong from, ulong to, flash_info_t *info)
 {
-       ulong b_end = info->start[0] + info->size - 1;  /* bank end address */
-       short s_end = info->sector_count - 1;   /* index of last sector */
+       ulong b_end;
+       short s_end;
        int i;
 
+       /* Do nothing if input data is bad. */
+       if (!info || info->sector_count == 0 || info->size == 0 || to < from) {
+               return;
+       }
+
+       s_end = info->sector_count - 1; /* index of last sector */
+       b_end = info->start[0] + info->size - 1;        /* bank end address */
+
        debug ("flash_protect %s: from 0x%08lX to 0x%08lX\n",
                (flag & FLAG_PROTECT_SET) ? "ON" :
                        (flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???",
                from, to);
 
-       /* Do nothing if input data is bad. */
-       if (info->sector_count == 0 || info->size == 0 || to < from) {
-               return;
-       }
-
        /* There is nothing to do if we have no data about the flash
         * or the protect range and flash range don't overlap.
         */
@@ -75,19 +78,19 @@ flash_protect (int flag, ulong from, ulong to, flash_info_t *info)
                 */
                if (from <= end && to >= info->start[i]) {
                        if (flag & FLAG_PROTECT_CLEAR) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                                flash_real_protect(info, i, 0);
 #else
                                info->protect[i] = 0;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                                debug ("protect off %d\n", i);
                        }
                        else if (flag & FLAG_PROTECT_SET) {
-#if defined(CFG_FLASH_PROTECTION)
+#if defined(CONFIG_SYS_FLASH_PROTECTION)
                                flash_real_protect(info, i, 1);
 #else
                                info->protect[i] = 1;
-#endif /* CFG_FLASH_PROTECTION */
+#endif /* CONFIG_SYS_FLASH_PROTECTION */
                                debug ("protect on %d\n", i);
                        }
                }
@@ -104,7 +107,7 @@ addr2info (ulong addr)
        flash_info_t *info;
        int i;
 
-       for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) {
+       for (i=0, info = &flash_info[0]; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i, ++info) {
                if (info->flash_id != FLASH_UNKNOWN &&
                    addr >= info->start[0] &&
                    /* WARNING - The '- 1' is needed if the flash
@@ -225,4 +228,4 @@ void flash_perror (int err)
 
 /*-----------------------------------------------------------------------
  */
-#endif /* !CFG_NO_FLASH */
+#endif /* !CONFIG_SYS_NO_FLASH */