dm36x: revert cache disable patch

[oweals/u-boot.git] / board / mcc200 / auto_update.c

diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index fcae35aaf8f227614d55b9d0958032a30dabc569..49213d0b388f87f07d38c28d2cf61ae6ed525c20 100644 (file)
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -25,7 +25,7 @@
 #include <usb.h>
 #include <part.h>
 
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
 #include <hush.h>
 #endif
 
@@ -40,8 +40,8 @@
 #error "must define CONFIG_USB_STORAGE"
 #endif
 
-#ifndef CFG_HUSH_PARSER
-#error "must define CFG_HUSH_PARSER"
+#ifndef CONFIG_SYS_HUSH_PARSER
+#error "must define CONFIG_SYS_HUSH_PARSER"
 #endif
 
 #if !defined(CONFIG_CMD_FAT)
@@ -144,7 +144,7 @@ int au_check_cksum_valid(int idx, long nbytes)
 
        hdr = (image_header_t *)LOAD_ADDR;
 #if defined(CONFIG_FIT)
-       if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
                puts ("Non legacy image format not supported\n");
                return -1;
        }
@@ -169,7 +169,7 @@ int au_check_header_valid(int idx, long nbytes)
 
        hdr = (image_header_t *)LOAD_ADDR;
 #if defined(CONFIG_FIT)
-       if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
                puts ("Non legacy image format not supported\n");
                return -1;
        }
@@ -247,7 +247,7 @@ int au_do_update(int idx, long sz)
 
        hdr = (image_header_t *)LOAD_ADDR;
 #if defined(CONFIG_FIT)
-       if (gen_image_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
+       if (genimg_get_format ((void *)hdr) != IMAGE_FORMAT_LEGACY) {
                puts ("Non legacy image format not supported\n");
                return -1;
        }
@@ -491,7 +491,7 @@ int do_auto_update(void)
                        aufile[i], sz, image_get_header_size ());
 
                if (sz != ausize[i]) {
-                       printf ("%s: size %d read %d?\n", aufile[i], ausize[i], sz);
+                       printf ("%s: size %ld read %ld?\n", aufile[i], ausize[i], sz);
                        continue;
                }