image: Don't detect XIP images as overlapping.

[karo-tx-uboot.git] / common / usb_storage.c

diff --git a/common/usb_storage.c b/common/usb_storage.c
index 9ecf165d1af0e443dcb0b67f3eb657a87541c841..d9a2585d5800af782698e784f8c108f5e22f5133 100644 (file)
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -56,16 +56,17 @@
 #include <part.h>
 #include <usb.h>
 
-#undef USB_STOR_DEBUG
 #undef BBB_COMDAT_TRACE
 #undef BBB_XPORT_TRACE
 
 #ifdef USB_STOR_DEBUG
-#define USB_STOR_PRINTF(fmt, args...)  printf(fmt , ##args)
+#define USB_BLK_DEBUG  1
 #else
-#define USB_STOR_PRINTF(fmt, args...)
+#define USB_BLK_DEBUG  0
 #endif
 
+#define USB_STOR_PRINTF(fmt, args...)  debug_cond(USB_BLK_DEBUG, fmt, ##args)
+
 #include <scsi.h>
 /* direction table -- this indicates the direction of the data
  * transfer for each command code -- a 1 indicates input
@@ -173,11 +174,12 @@ unsigned long usb_stor_write(int device, unsigned long blknr,
 struct usb_device * usb_get_dev_index(int index);
 void uhci_show_temp_int_td(void);
 
+#ifdef CONFIG_PARTITIONS
 block_dev_desc_t *usb_stor_get_dev(int index)
 {
        return (index < usb_max_devs) ? &usb_dev_desc[index] : NULL;
 }
-
+#endif
 
 void usb_show_progress(void)
 {
@@ -371,7 +373,7 @@ static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
                                        usb_clear_halt(us->pusb_dev, pipe);
                                        us->pusb_dev->status = stat;
                                        if (this_xfer == partial) {
-                                               USB_STOR_PRINTF("bulk transferred with error %X, but data ok\n", us->pusb_dev->status);
+                                               USB_STOR_PRINTF("bulk transferred with error %lX, but data ok\n", us->pusb_dev->status);
                                                return 0;
                                        }
                                        else
@@ -383,12 +385,12 @@ static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
                                }
                                USB_STOR_PRINTF("bulk transferred with error");
                                if (this_xfer == partial) {
-                                       USB_STOR_PRINTF(" %d, but data ok\n",
+                                       USB_STOR_PRINTF(" %ld, but data ok\n",
                                                        us->pusb_dev->status);
                                        return 0;
                                }
                                /* if our try counter reaches 0, bail out */
-                                       USB_STOR_PRINTF(" %d, data %d\n",
+                                       USB_STOR_PRINTF(" %ld, data %d\n",
                                                us->pusb_dev->status, partial);
                                if (!maxtry--)
                                                return result;
@@ -436,19 +438,19 @@ static int usb_stor_BBB_reset(struct us_data *us)
 
        /* long wait for reset */
        wait_ms(150);
-       USB_STOR_PRINTF("BBB_reset result %d: status %X reset\n", result,
+       USB_STOR_PRINTF("BBB_reset result %d: status %lX reset\n", result,
                        us->pusb_dev->status);
        pipe = usb_rcvbulkpipe(us->pusb_dev, us->ep_in);
        result = usb_clear_halt(us->pusb_dev, pipe);
        /* long wait for reset */
        wait_ms(150);
-       USB_STOR_PRINTF("BBB_reset result %d: status %X clearing IN endpoint\n",
+       USB_STOR_PRINTF("BBB_reset result %d: status %lX clearing IN endpoint\n",
                        result, us->pusb_dev->status);
        /* long wait for reset */
        pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
        result = usb_clear_halt(us->pusb_dev, pipe);
        wait_ms(150);
-       USB_STOR_PRINTF("BBB_reset result %d: status %X"
+       USB_STOR_PRINTF("BBB_reset result %d: status %lX"
                        " clearing OUT endpoint\n", result,
                        us->pusb_dev->status);
        USB_STOR_PRINTF("BBB_reset done\n");
@@ -476,7 +478,7 @@ static int usb_stor_CB_reset(struct us_data *us)
 
        /* long wait for reset */
        wait_ms(1500);
-       USB_STOR_PRINTF("CB_reset result %d: status %X"
+       USB_STOR_PRINTF("CB_reset result %d: status %lX"
                        " clearing endpoint halt\n", result,
                        us->pusb_dev->status);
        usb_clear_halt(us->pusb_dev, usb_rcvbulkpipe(us->pusb_dev, us->ep_in));
@@ -567,7 +569,7 @@ int usb_stor_CB_comdat(ccb *srb, struct us_data *us)
                                         srb->cmd, srb->cmdlen,
                                         USB_CNTL_TIMEOUT * 5);
                USB_STOR_PRINTF("CB_transport: control msg returned %d,"
-                               " status %X\n", result, us->pusb_dev->status);
+                               " status %lX\n", result, us->pusb_dev->status);
                /* check the return code for the command */
                if (result < 0) {
                        if (us->pusb_dev->status & USB_ST_STALLED) {
@@ -579,7 +581,7 @@ int usb_stor_CB_comdat(ccb *srb, struct us_data *us)
                                us->pusb_dev->status = status;
                        }
                        USB_STOR_PRINTF(" error during command %02X"
-                                       " Stat = %X\n", srb->cmd[0],
+                                       " Stat = %lX\n", srb->cmd[0],
                                        us->pusb_dev->status);
                        return result;
                }
@@ -776,7 +778,7 @@ again:
                usb_stor_BBB_reset(us);
                return USB_STOR_TRANSPORT_FAILED;
        } else if (data_actlen > srb->datalen) {
-               USB_STOR_PRINTF("transferred %dB instead of %dB\n",
+               USB_STOR_PRINTF("transferred %dB instead of %ldB\n",
                        data_actlen, srb->datalen);
                return USB_STOR_TRANSPORT_FAILED;
        } else if (csw.bCSWStatus == CSWSTATUS_FAILED) {
@@ -801,7 +803,7 @@ int usb_stor_CB_transport(ccb *srb, struct us_data *us)
        /* issue the command */
 do_retry:
        result = usb_stor_CB_comdat(srb, us);
-       USB_STOR_PRINTF("command / Data returned %d, status %X\n",
+       USB_STOR_PRINTF("command / Data returned %d, status %lX\n",
                        result, us->pusb_dev->status);
        /* if this is an CBI Protocol, get IRQ */
        if (us->protocol == US_PR_CBI) {
@@ -824,7 +826,7 @@ do_retry:
        /* do we have to issue an auto request? */
        /* HERE we have to check the result */
        if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
-               USB_STOR_PRINTF("ERROR %X\n", us->pusb_dev->status);
+               USB_STOR_PRINTF("ERROR %lX\n", us->pusb_dev->status);
                us->transport_reset(us);
                return USB_STOR_TRANSPORT_ERROR;
        }
@@ -851,7 +853,7 @@ do_retry:
                status = usb_stor_CBI_get_status(psrb, us);
 
        if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
-               USB_STOR_PRINTF(" AUTO REQUEST ERROR %d\n",
+               USB_STOR_PRINTF(" AUTO REQUEST ERROR %ld\n",
                                us->pusb_dev->status);
                return USB_STOR_TRANSPORT_ERROR;
        }