projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/mtd: Move conditional compilation to Makefile
[platform/kernel/u-boot.git]
/
include
/
configs
/
MVBLM7.h
diff --git
a/include/configs/MVBLM7.h
b/include/configs/MVBLM7.h
index
0b238bd
..
0dce9b4
100644
(file)
--- a/
include/configs/MVBLM7.h
+++ b/
include/configs/MVBLM7.h
@@
-27,7
+27,7
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#
define MV_VERSION "v1.0.1"
+#
include <version.h>
/*
* High Level Configuration Options
/*
* High Level Configuration Options
@@
-104,7
+104,7
@@
/* Flash */
#define CFG_FLASH_CFI
/* Flash */
#define CFG_FLASH_CFI
-#define C
F
G_FLASH_CFI_DRIVER
+#define C
ONFI
G_FLASH_CFI_DRIVER
#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CFG_FLASH_BASE 0xFF800000
#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CFG_FLASH_BASE 0xFF800000
@@
-336,6
+336,7
@@
#define CFG_HID0_FINAL CFG_HID0_INIT
#define CFG_HID2 HID2_HBE
#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)
/* 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_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" \
"dhcp_client_id=" MV_CI "\0" \
"dhcp_vendor-class-identifier=" MV_VCI "\0" \
"netretry=no\0" \