update mvBL-M7 board config

update mvBL-M7 config file to use UBOOT_VERSION and define
CONFIG_HIGH_BATS.

Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>

diff --git a/board/mvblm7/mvblm7.c b/board/mvblm7/mvblm7.c
index 69fd7850e3b4bbb1f5945eb194384b8b91b7bf94..b07f91393c2acf589c35069ee1de41c91b842e86 100644 (file)
--- a/board/mvblm7/mvblm7.c
+++ b/board/mvblm7/mvblm7.c
@@ -90,7 +90,7 @@ phys_size_t initdram(int board_type)
 
 int checkboard(void)
 {
-       puts("Board: Matrix Vision mvBlueLYNX-M7 " MV_VERSION "\n");
+       puts("Board: Matrix Vision mvBlueLYNX-M7\n");
 
        return 0;
 }

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 0b238bdb85c3fffc2dd8afcd66ed2bf01def139a..b412655b6dd05a42273ab46f4abac863768712fb 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -27,7 +27,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define MV_VERSION  "v1.0.1"
+#include <version.h>
 
 /*
  * High Level Configuration Options
@@ -336,6 +336,7 @@
 #define CFG_HID0_FINAL CFG_HID0_INIT
 
 #define CFG_HID2       HID2_HBE
+#define CONFIG_HIGH_BATS       1
 
 /* DDR  */
 #define CFG_IBAT0L     (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
@@ -446,7 +447,7 @@
        "mv_dtb_addr=" MV_DTB_ADDR "\0"                         \
        "mv_dtb_addr_ram=" MV_DTB_ADDR_RAM "\0"                 \
        "dtb_name=" MV_DTB_NAME "\0"                            \
-       "mv_version=" MV_VERSION "\0"                           \
+       "mv_version=" U_BOOT_VERSION "\0"                       \
        "dhcp_client_id=" MV_CI "\0"                            \
        "dhcp_vendor-class-identifier=" MV_VCI "\0"             \
        "netretry=no\0"                                         \