summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2015-02-05 14:30:21 +0900
committerMasahiro Yamada <yamada.m@jp.panasonic.com>2015-02-07 00:11:03 +0900
commit0e063dff5c8a555ad92e26edb5c6358a127d5c8f (patch)
tree0e3b1f61eab88e89088ae6d79a380d757c442609
parent5848899a1f868fe6ae50027d422f0af5f4e2e95d (diff)
downloadblackbird-obmc-uboot-0e063dff5c8a555ad92e26edb5c6358a127d5c8f.tar.gz
blackbird-obmc-uboot-0e063dff5c8a555ad92e26edb5c6358a127d5c8f.zip
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>
-rw-r--r--include/configs/uniphier.h10
1 files changed, 5 insertions, 5 deletions
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" \
OpenPOWER on IntegriCloud