diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /scripts/imx | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'scripts/imx')
| -rw-r--r-- | scripts/imx/imx-usb-loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c index 81c0640bee..12a89f5825 100644 --- a/scripts/imx/imx-usb-loader.c +++ b/scripts/imx/imx-usb-loader.c @@ -326,7 +326,7 @@ static int transfer(struct libusb_device_handle *h, int report, unsigned char *p memcpy(p, &tmp[1], *last_trans); } } else { - printf("Unexpected report %i err=%i, cnt=%i, last_trans=%i, %02x %02x %02x %02x\n", + printf("Unexpected report %i err=%i, cnt=%u, last_trans=%i, %02x %02x %02x %02x\n", tmp[0], err, cnt, *last_trans, tmp[0], tmp[1], tmp[2], tmp[3]); err = 0; } @@ -475,7 +475,7 @@ static int read_memory(struct libusb_device_handle *h, struct usb_id *p_id, tmp[0] = tmp[1] = tmp[2] = tmp[3] = 0; err = transfer(h, 4, tmp, 64, &last_trans, p_id); if (err) { - printf("r4 in err=%i, last_trans=%i %02x %02x %02x %02x cnt=%d rem=%d\n", + printf("r4 in err=%i, last_trans=%i %02x %02x %02x %02x cnt=%u rem=%d\n", err, last_trans, tmp[0], tmp[1], tmp[2], tmp[3], cnt, rem); break; } @@ -483,7 +483,7 @@ static int read_memory(struct libusb_device_handle *h, struct usb_id *p_id, if ((last_trans == 64) && (cnt == rem)) { /* Last transfer is expected to be too large for HID */ } else { - printf("err: %02x %02x %02x %02x cnt=%d rem=%d last_trans=%i\n", + printf("err: %02x %02x %02x %02x cnt=%u rem=%d last_trans=%i\n", tmp[0], tmp[1], tmp[2], tmp[3], cnt, rem, last_trans); } last_trans = rem; @@ -1247,7 +1247,7 @@ static int do_irom_download(struct libusb_device_handle *h, struct usb_id *p_id, } } - printf("loading binary file(%s) to %08x, skip=0x%x, fsize=%d type=%d...\n", + printf("loading binary file(%s) to %08x, skip=0x%x, fsize=%u type=%d...\n", curr->filename, dladdr, skip, fsize, type); ret = load_file(h, p_id, p, cnt, buf, BUF_SIZE, |