Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
[oweals/u-boot.git] / board / icecube / flash.c
index 07879ffb07d122587b88988bbf516f8f9b7f6ec2..713011c972aa22fb299a7aa3b3813198a55261f7 100644 (file)
@@ -123,7 +123,7 @@ static flash_info_t *flash_get_info(ulong base)
 
        for (i = 0; i < CFG_MAX_FLASH_BANKS; i ++) {
                info = & flash_info[i];
-               if (info->size && 
+               if (info->size &&
                        info->start[0] <= base && base <= info->start[0] + info->size - 1)
                        break;
        }
@@ -139,7 +139,7 @@ void flash_print_info (flash_info_t *info)
        int i;
        uchar *boottype;
        uchar *bootletter;
-       uchar *fmt;
+       char *fmt;
        uchar botbootletter[] = "B";
        uchar topbootletter[] = "T";
        uchar botboottype[] = "bottom boot sector";
@@ -260,7 +260,7 @@ ulong flash_get_size (FPWV *addr, flash_info_t *info)
        addr2 = (FPW *)((ulong)addr | 0x800000);
        if (addr2 != addr &&
                ((addr2[0] & 0xff) == (addr[0] & 0xff)) && ((FPW)addr2[1] == (FPW)addr[1])) {
-               /* Seems 2 banks are the same space (8Mb chip is installed, 
+               /* Seems 2 banks are the same space (8Mb chip is installed,
                 * J24 in default position (CS0)). Disable this (first) bank.
                 */
                info->flash_id = FLASH_UNKNOWN;