ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC

[u-boot] / common / usb_storage.c

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 4fc01a22b4d4e5c95adfb81c8274baf2016f638b..76949b85c0f2793e4bccb4f1dbb63a04b259aed8 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -181,7 +181,7 @@ block_dev_desc_t *usb_stor_get_dev(int index)
 
 void usb_show_progress(void)
 {
-       printf(".");
+       debug(".");
 }
 
 /*******************************************************************************
@@ -224,10 +224,11 @@ int usb_stor_scan(int mode)
 
        for (i = 0; i < USB_MAX_STOR_DEV; i++) {
                memset(&usb_dev_desc[i], 0, sizeof(block_dev_desc_t));
-               usb_dev_desc[i].target = 0xff;
                usb_dev_desc[i].if_type = IF_TYPE_USB;
                usb_dev_desc[i].dev = i;
                usb_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
+               usb_dev_desc[i].target = 0xff;
+               usb_dev_desc[i].type = DEV_TYPE_UNKNOWN;
                usb_dev_desc[i].block_read = usb_stor_read;
                usb_dev_desc[i].block_write = usb_stor_write;
        }
@@ -1080,7 +1081,7 @@ retry_it:
 
        usb_disable_asynch(0); /* asynch transfer allowed */
        if (blkcnt >= USB_MAX_READ_BLK)
-               printf("\n");
+               debug("\n");
        return blkcnt;
 }
 
@@ -1160,7 +1161,7 @@ retry_it:
 
        usb_disable_asynch(0); /* asynch transfer allowed */
        if (blkcnt >= USB_MAX_WRITE_BLK)
-               printf("\n");
+               debug("\n");
        return blkcnt;
 
 }