colibri_vf: fix model info display with missing config block

Display model information even if config block is missing.

While at it fix an indentation issue, update copyright period and fix
abbreviated setenv commands.

diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c
index 85e5389d57a5a7bbc574be339493474c6721d877..7027c4457c3dde6a6fe345dbc51bdd8fdab018cb 100644 (file)
--- a/board/toradex/colibri_vf/colibri_vf.c
+++ b/board/toradex/colibri_vf/colibri_vf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Toradex, Inc.
+ * Copyright 2013-2015 Toradex, Inc.
  *
  * Based on vf610twr.c:
  * Copyright 2013 Freescale Semiconductor, Inc.
@@ -336,7 +336,7 @@ int board_late_init(void)
 
        if (((src->sbmr2 & SRC_SBMR2_BMOD_MASK) >> SRC_SBMR2_BMOD_SHIFT)
                        == SRC_SBMR2_BMOD_SERIAL) {
-               printf("Serial Downloader recovery mode, disable autoboot\n");
+               printf("Serial Downloader recovery mode, disabled autoboot\n");
                setenv("bootdelay", "-1");
        }
 
@@ -355,7 +355,7 @@ int board_init(void)
         * Enable external 32K Oscillator
         *
         * The internal clock experiences significant drift
-     * so we must use the external oscillator in order
+        * so we must use the external oscillator in order
         * to maintain correct time in the hwclock
         */
 
@@ -369,14 +369,16 @@ int checkboard(void)
 #ifdef CONFIG_TRDX_CFG_BLOCK
        if (read_trdx_cfg_block())
                printf("Missing Toradex config block\n");
-       else
+       else {
                display_board_info();
-#else
+               return 0;
+       }
+#endif
        if (is_colibri_vf61())
-               puts("Board: Colibri VF61\n");
+               puts("Model: Toradex Colibri VF61 256MB\n");
        else
-               puts("Board: Colibri VF50\n");
-#endif
+               puts("Model: Toradex Colibri VF50 128MB\n");
+
        return 0;
 }
 

diff --git a/board/toradex/colibri_vf/imximage.cfg b/board/toradex/colibri_vf/imximage.cfg
index 8c528863ad273d69440ba746fef7923540f2214a..dcfd5e2d9a626f9a34c7a0f574f7be35e5aa5ae6 100644 (file)
--- a/board/toradex/colibri_vf/imximage.cfg
+++ b/board/toradex/colibri_vf/imximage.cfg
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Toradex, Inc.
+ * Copyright 2013-2015 Toradex, Inc.
  *
  * SPDX-License-Identifier:    GPL-2.0+
  *

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index b64fd1541ee05e7f64cbaa71384e489e6d704e8b..c099bed05bec250eae521be50b438019c0bf3736 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Toradex, Inc.
+ * Copyright 2013-2015 Toradex, Inc.
  *
  * Configuration settings for the Toradex VF50/VF61 module.
  *
@@ -159,10 +159,10 @@
        "setup=setenv setupargs " \
                "fec_mac=${ethaddr} console=tty1 console=${console}" \
                ",${baudrate}n8 ${memargs}\0" \
-       "setsdupdate=mmc rescan && set interface mmc && " \
+       "setsdupdate=mmc rescan && setenv interface mmc && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
-       "setusbupdate=usb start && set interface usb && " \
+       "setusbupdate=usb start && setenv interface usb && " \
                "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
        "setupdate=run setsdupdate || run setusbupdate\0" \