diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-09-04 18:12:18 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-10-02 19:26:39 +0200 |
| commit | a264de806fd59ad123ff48388ca0e979f6e44b2c (patch) | |
| tree | 3939fe0d4bc985d322104df9ab82abea22df0a33 | |
| parent | cd255bc67154cb5d2a5c96803da147a6ab4cb58c (diff) | |
colibri_imx7_emmc: clean-up config header file
Clean-up config header file. Re-order boot commands.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | include/configs/colibri_imx7_emmc.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/configs/colibri_imx7_emmc.h b/include/configs/colibri_imx7_emmc.h index 4b844f9c80..1fe3d0f66a 100644 --- a/include/configs/colibri_imx7_emmc.h +++ b/include/configs/colibri_imx7_emmc.h @@ -1,5 +1,5 @@ /* - * Copyright 2016 Toradex AG + * Copyright 2017 Toradex AG * * Configuration settings for the Colibri iMX7 module. * @@ -71,7 +71,7 @@ "emmcargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext4 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 m4boot && " \ "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ "load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \ @@ -87,8 +87,17 @@ "ramdisk_addr_r=0x82100000\0" \ "scriptaddr=0x87000000\0" +#define NFS_BOOTCMD \ + "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ + "nfsboot=run setup; " \ + "setenv bootargs ${defargs} ${nfsargs} " \ + "${setupargs} ${vidargs}; echo Booting from NFS...;" \ + "dhcp ${kernel_addr_r} && " \ + "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + #define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \ + "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ "run m4boot && " \ @@ -96,15 +105,6 @@ "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ - "nfsboot=run setup; " \ - "setenv bootargs ${defargs} ${nfsargs} " \ - "${setupargs} ${vidargs}; echo Booting from NFS...;" \ - "dhcp ${kernel_addr_r} && " \ - "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - #define CONFIG_BOOTCOMMAND "run ubiboot; " \ "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" |