From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Thu, 5 Feb 2015 05:30:21 +0000 (+0900)
Subject: ARM: UniPhier: use "&&" instead of "; " in commands
X-Git-Tag: v2015.04-rc2~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e063dff5c8a555ad92e26edb5c6358a127d5c8f;p=oweals%2Fu-boot.git

ARM: UniPhier: use "&&" instead of "; " in commands

Run the next command only when the previous one succeeded.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 9ad47f6933..43d2a4c359 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Panasonic Corporation
+ * Copyright (C) 2012-2015 Panasonic Corporation
  *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
@@ -235,11 +235,11 @@
 	"image_offset=0x00080000\0"		\
 	"image_size=0x00f00000\0"		\
 	"verify=n\0"				\
-	"norboot=run add_default_bootargs;"				\
+	"norboot=run add_default_bootargs &&"				\
 		"bootm $image_offset\0"					\
-	"nandboot=run add_default_bootargs;"				\
-		"nand read $loadaddr $image_offset $image_size;"	\
-		"bootm\0"						\
+	"nandboot=run add_default_bootargs &&"				\
+		 "nand read $loadaddr $image_offset $image_size &&"	\
+		 "bootm\0"						\
 	"add_default_bootargs=setenv bootargs $bootargs"		\
 		" console=ttyS0,$baudrate\0"				\