From 7ea899a6d87e0d428c9204cf8d6268dff88dec58 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Mon, 6 Apr 2015 19:05:40 +0200 Subject: [PATCH] Revert "cmd_recovery: seperate multicommand lines by "&&"." This reverts commit a418c264b2ab171c8d2dbf70f2d771fee56e5e36. run_command() doesn't understand &&. --- u-boot/common/cmd_recovery.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/u-boot/common/cmd_recovery.c b/u-boot/common/cmd_recovery.c index 66767a01ab..92ba9f4a93 100644 --- a/u-boot/common/cmd_recovery.c +++ b/u-boot/common/cmd_recovery.c @@ -102,15 +102,15 @@ static int do_run_recovery(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) rc = run_command("setenv filesize 0; " "tftp 0x81000000 " RECOVERY_FILENAME_STRING, 0); if (rc < 0) { - rc = run_command("setenv filesize 0 && " - "setenv serverip 255.255.255.255 && " + rc = run_command("setenv filesize 0; " + "setenv serverip 255.255.255.255; " "tftp 0x81000000 " RECOVERY_FILENAME_STRING, 0); } if (rc < 0) return tftp_failed(); - rc = run_command("erase 0x9f050000 +0x7a0000 && " + rc = run_command("erase 0x9f050000 +0x7a0000; " "cp.b 0x81000000 0x9f050000 0x7a0000", 0); if (rc < 0) return flash_failed();