sdhci: Add sdhci support for spear devices

[u-boot] / common / flash.c

diff --git a/common/flash.c b/common/flash.c
index eb4b2f5ff1cb8a7a841c9758d078dd8810847207..0c57a3fcdde9b6bc777e6501721e1b0d4bc1f5c1 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -27,6 +27,7 @@
 #include <flash.h>
 
 #if !defined(CONFIG_SYS_NO_FLASH)
+#include <mtd/cfi_flash.h>
 
 extern flash_info_t  flash_info[]; /* info for FLASH chips */
 
@@ -43,15 +44,18 @@ 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->sector_count == 0 || info->size == 0 || to < from) {
+       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" : "???",
@@ -145,6 +149,9 @@ flash_write (char *src, ulong addr, ulong cnt)
        flash_info_t *info_first = addr2info (addr);
        flash_info_t *info_last  = addr2info (end );
        flash_info_t *info;
+       __maybe_unused char *src_orig = src;
+       __maybe_unused char *addr_orig = (char *)addr;
+       __maybe_unused ulong cnt_orig = cnt;
 
        if (cnt == 0) {
                return (ERR_OK);
@@ -181,6 +188,14 @@ flash_write (char *src, ulong addr, ulong cnt)
                addr += len;
                src  += len;
        }
+
+#if defined(CONFIG_FLASH_VERIFY)
+       if (memcmp(src_orig, addr_orig, cnt_orig)) {
+               printf("\nVerify failed!\n");
+               return ERR_PROG_ERROR;
+       }
+#endif /* CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE */
+
        return (ERR_OK);
 #endif /* CONFIG_SPD823TS */
 }
@@ -217,6 +232,9 @@ void flash_perror (int err)
        case ERR_PROG_ERROR:
                puts ("General Flash Programming Error\n");
                break;
+       case ERR_ABORTED:
+               puts("Flash Programming Aborted\n");
+               break;
        default:
                printf ("%s[%d] FIXME: rc=%d\n", __FILE__, __LINE__, err);
                break;