diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-09-20 15:46:34 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-10-02 19:28:40 +0200 |
| commit | d5efded67451c4c12a1817f19de05481786a2de6 (patch) | |
| tree | 294253e71c14d1988a8c1d1d80131163e037a92c /include | |
| parent | 1f99e32356d5476237236e0ed55f294ded100c10 (diff) | |
apalis/colibri_imx6: fix white space
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/apalis_imx6.h | 6 | ||||
| -rw-r--r-- | include/configs/colibri_imx6.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 92a9ed99ca..76cbdf2345 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Toradex, Inc. + * Copyright 2013-2017 Toradex, Inc. * * Configuration settings for the Toradex Apalis iMX6 * @@ -199,7 +199,7 @@ "rootwait\0" \ "emmcboot=run setup; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ + "${vidargs}; echo Booting from internal eMMC chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ "bootm ${kernel_addr_r} ${dtbparam}\0" \ @@ -226,7 +226,7 @@ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -#define SD_BOOTCMD \ +#define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ "rootwait\0" \ "sdboot=run setup; " \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 78e85aee5b..ab561f3969 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015 Toradex, Inc. + * Copyright 2013-2017 Toradex, Inc. * * Configuration settings for the Toradex Colibri iMX6 * @@ -179,7 +179,7 @@ "rootwait\0" \ "emmcboot=run setup; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ + "${vidargs}; echo Booting from internal eMMC chip...; " \ "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ "bootm ${kernel_addr_r} ${dtbparam}\0" \ @@ -206,7 +206,7 @@ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -#define SD_BOOTCMD \ +#define SD_BOOTCMD \ "sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 " \ "rootwait\0" \ "sdboot=run setup; " \ |