diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-10-30 09:05:08 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-10-30 09:13:43 +0100 |
| commit | 66e56ba1d0d662b22703c914b6e9e77bc06c3c26 (patch) | |
| tree | 2ada2cd69fccf17a1315e933da8b3df0cdbb8bb5 | |
| parent | fcd276d1e11d9925c2c7c174bdb02518644d0ba3 (diff) | |
colibri_vf: sort extra env settings
Sort CONFIG_EXTRA_ENV_SETTINGS alphabetically in order to allow for
easy comparison with our other board configuration files.
| -rw-r--r-- | include/configs/colibri_vf.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 6f33df6913..3d8da90bb7 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -181,31 +181,31 @@ #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ + "console=ttyLP0\0" \ + "defargs=\0" \ + "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_addr_r=0x84000000\0" \ - "kernel_file=zImage\0" \ "fdt_board=eval-v3\0" \ "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ "fdt_fixup=;\0" \ - "defargs=\0" \ - "console=ttyLP0\0" \ - "setup=setenv setupargs " \ - "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + "kernel_addr_r=0x82000000\0" \ + "kernel_file=zImage\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + NFS_BOOTCMD \ + SD_BOOTCMD \ "setsdupdate=mmc rescan && setenv interface mmc && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ + "setup=setenv setupargs " \ + "console=tty1 console=${console}" \ + ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + "setupdate=run setsdupdate || run setusbupdate\0" \ "setusbupdate=usb start && setenv interface usb && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ "source ${loadaddr}\0" \ - "setupdate=run setsdupdate || run setusbupdate\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ - "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ - "video-mode=dcufb:640x480-16@60,monitor=lcd\0" \ "splashpos=m,m\0" \ - SD_BOOTCMD \ - NFS_BOOTCMD \ - UBI_BOOTCMD + UBI_BOOTCMD \ + "video-mode=dcufb:640x480-16@60,monitor=lcd\0" /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ |