main: Do not enter to usb mode if not needed

This commit is contained in:
Pali Rohár committed 2012-08-10 17:19:03 +02:00
1 parent aa89ef8dad
commit 19a8d76e0c
1 file changed
+30 -26
+30 -26
View File
@@ -712,42 +712,46 @@ int main(int argc, char **argv) {
} }
} }
while ( image_first ) { if ( dev_boot || dev_reboot || dev_load || dev_flash || dev_cold_flash || dev_ident || set_root || set_usb || set_rd || set_rd_flags || set_hw || set_kernel || set_nolo || set_sw || set_emmc ) {
usb_dev = usb_open_and_wait_for_device(); while ( image_first ) {
/* cold flash */ usb_dev = usb_open_and_wait_for_device();
if ( dev_cold_flash ) {
ret = cold_flash(usb_dev, image_2nd, image_secondary); /* cold flash */
usb_close_device(usb_dev); if ( dev_cold_flash ) {
usb_dev = NULL;
if ( ret != 0 ) ret = cold_flash(usb_dev, image_2nd, image_secondary);
continue; usb_close_device(usb_dev);
usb_dev = NULL;
if ( ret != 0 )
continue;
if ( dev_flash ) {
dev_cold_flash = 0;
continue;
}
break;
if ( dev_flash ) {
dev_cold_flash = 0;
continue;
} }
break; /* device identify */
// while(get_status());
/* flash */
/* configuration */
/* load */
/* boot */
/* reboot */
} }
/* device identify */
// while(get_status());
/* flash */
/* configuration */
/* load */
/* boot */
/* reboot */
} }