zynq_common: Ensure that commands won't be run partially

Ensure that if one command fails when others won't be
executed.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index fbedc9b09e17a930a06bb07a4638bf8bb5f9d70f..3e47c4f33111ee4e7b27a963a8dada961739bf23 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -210,34 +210,34 @@
        "fdt_high=0x20000000\0" \
        "initrd_high=0x20000000\0"      \
        "norboot=echo Copying Linux from NOR flash to RAM...;" \
-               "cp 0xE2100000 0x3000000 ${kernel_size};" \
-               "cp 0xE2600000 0x2A00000 ${devicetree_size};" \
-               "echo Copying ramdisk...;" \
-               "cp 0xE2620000 0x2000000 ${ramdisk_size};" \
+               "cp 0xE2100000 0x3000000 ${kernel_size} && " \
+               "cp 0xE2600000 0x2A00000 ${devicetree_size} && " \
+               "echo Copying ramdisk... && " \
+               "cp 0xE2620000 0x2000000 ${ramdisk_size} && " \
                "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "qspiboot=echo Copying Linux from QSPI flash to RAM...;" \
-               "sf probe 0 0 0;" \
-               "sf read 0x3000000 0x100000 ${kernel_size};" \
-               "sf read 0x2A00000 0x600000 ${devicetree_size};" \
-               "echo Copying ramdisk...;" \
-               "sf read 0x2000000 0x620000 ${ramdisk_size};" \
+       "qspiboot=echo Copying Linux from QSPI flash to RAM... && " \
+               "sf probe 0 0 0 && " \
+               "sf read 0x3000000 0x100000 ${kernel_size} && " \
+               "sf read 0x2A00000 0x600000 ${devicetree_size} && " \
+               "echo Copying ramdisk... && " \
+               "sf read 0x2000000 0x620000 ${ramdisk_size} && " \
                "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "sdboot=echo Copying Linux from SD to RAM...;" \
-               "mmcinfo;" \
-               "fatload mmc 0 0x3000000 ${kernel_image};" \
-               "fatload mmc 0 0x2A00000 ${devicetree_image};" \
-               "fatload mmc 0 0x2000000 ${ramdisk_image};" \
+       "sdboot=echo Copying Linux from SD to RAM... && " \
+               "mmcinfo && " \
+               "fatload mmc 0 0x3000000 ${kernel_image} && " \
+               "fatload mmc 0 0x2A00000 ${devicetree_image} && " \
+               "fatload mmc 0 0x2000000 ${ramdisk_image} && " \
                "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "nandboot=echo Copying Linux from NAND flash to RAM...;" \
-               "nand read 0x3000000 0x100000 ${kernel_size};" \
-               "nand read 0x2A00000 0x600000 ${devicetree_size};" \
-               "echo Copying ramdisk...;" \
-               "nand read 0x2000000 0x620000 ${ramdisk_size};" \
+       "nandboot=echo Copying Linux from NAND flash to RAM... && " \
+               "nand read 0x3000000 0x100000 ${kernel_size} && " \
+               "nand read 0x2A00000 0x600000 ${devicetree_size} && " \
+               "echo Copying ramdisk... && " \
+               "nand read 0x2000000 0x620000 ${ramdisk_size} && " \
                "bootm 0x3000000 0x2000000 0x2A00000\0" \
-       "jtagboot=echo TFTPing Linux to RAM...;" \
-               "tftp 0x3000000 ${kernel_image};" \
-               "tftp 0x2A00000 ${devicetree_image};" \
-               "tftp 0x2000000 ${ramdisk_image};" \
+       "jtagboot=echo TFTPing Linux to RAM... && " \
+               "tftp 0x3000000 ${kernel_image} && " \
+               "tftp 0x2A00000 ${devicetree_image} && " \
+               "tftp 0x2000000 ${ramdisk_image} && " \
                "bootm 0x3000000 0x2000000 0x2A00000\0"
 
 /* default boot is according to the bootmode switch settings */