diff options
| author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
| commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
| tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /include/configs/MVBLM7.h | |
| parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
| parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
| download | u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-imx-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/configs/MVBLM7.h')
| -rw-r--r-- | include/configs/MVBLM7.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 349ca14..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 @@ -262,7 +262,7 @@ #define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CFG_ENV_SIZE) #define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE -#define CONFIG_LOADS_ECHO +#define CONFIG_LOADS_ECHO #define CFG_LOADS_BAUD_CHANGE /* @@ -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" \ |