summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Schwarz <andre.schwarz@matrix-vision.de>2008-07-02 18:54:08 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:30:20 +0200
commit5ed546fdd0ca46a165661c2009fa743d9c9fceca (patch)
tree32b0ed6528d3905b76203cb5f0d68da78237ecb8
parent5cacc5d0ec52678a5eb83ecda5c3bcb22eb47f30 (diff)
downloadu-boot-imx-5ed546fdd0ca46a165661c2009fa743d9c9fceca.zip
u-boot-imx-5ed546fdd0ca46a165661c2009fa743d9c9fceca.tar.gz
u-boot-imx-5ed546fdd0ca46a165661c2009fa743d9c9fceca.tar.bz2
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>
-rw-r--r--board/mvblm7/mvblm7.c2
-rw-r--r--include/configs/MVBLM7.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/board/mvblm7/mvblm7.c b/board/mvblm7/mvblm7.c
index 69fd785..b07f913 100644
--- 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 0b238bd..b412655 100644
--- 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" \