Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/board/armadillo/flash.c b/board/armadillo/flash.c
index f25a8e7..8518856 100644 (file)
--- a/board/armadillo/flash.c
+++ b/board/armadillo/flash.c
@@ -118,7 +118,9 @@ void flash_print_info (flash_info_t * info)
        }
        printf ("\n");
 
-      Done:
+/*
+Done:  ;
+*/
 }
 
 /*
@@ -277,7 +279,7 @@ int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
        int i, rc;
 
        wp = (addr & ~1);       /* get lower word aligned address */
-       printf ("Writing %d short data to 0x%p from 0x%p.\n ", cnt, wp, src);
+       printf ("Writing %lu short data to 0x%lx from 0x%p.\n ", cnt, wp, src);
 
        /*
         * handle unaligned start bytes