Merge with git+ssh://gemini_vpn/home/wd/git/u-boot/master

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

diff --git a/common/flash.c b/common/flash.c
index 2fb3319d40f4f213ba4265db1446469c417065b5..888ff9c67c676918f5bed737bccb93e7ae058c1d 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -47,16 +47,16 @@ flash_protect (int flag, ulong from, ulong to, flash_info_t *info)
        short s_end = info->sector_count - 1;   /* index of last sector */
        int i;
 
-       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;
        }
 
+       debug ("flash_protect %s: from 0x%08lX to 0x%08lX\n",
+               (flag & FLAG_PROTECT_SET) ? "ON" :
+                       (flag & FLAG_PROTECT_CLEAR) ? "OFF" : "???",
+               from, to);
+
        /* There is nothing to do if we have no data about the flash
         * or the protect range and flash range don't overlap.
         */
@@ -135,7 +135,7 @@ addr2info (ulong addr)
  *                     (only some targets require alignment)
  */
 int
-flash_write (uchar *src, ulong addr, ulong cnt)
+flash_write (char *src, ulong addr, ulong cnt)
 {
 #ifdef CONFIG_SPD823TS
        return (ERR_TIMOUT);    /* any other error codes are possible as well */
@@ -174,7 +174,7 @@ flash_write (uchar *src, ulong addr, ulong cnt)
                len = info->start[0] + info->size - addr;
                if (len > cnt)
                        len = cnt;
-               if ((i = write_buff(info, src, addr, len)) != 0) {
+               if ((i = write_buff(info, (uchar *)src, addr, len)) != 0) {
                        return (i);
                }
                cnt  -= len;