summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-07-07 00:32:47 +0200
committerWolfgang Denk <wd@denx.de>2008-07-07 00:32:47 +0200
commit3070a9a3cb41ed6b19f79590f7713d5685ab1066 (patch)
tree2d69ea08d00d228dac08992180c421defee3105b /include
parent9fea65a6c469b1b474b27446feb58738baba2d31 (diff)
parentf16ed51702cb9fb6fa2e019bbc0fcd1466b57c3b (diff)
downloadu-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.zip
u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.gz
u-boot-imx-3070a9a3cb41ed6b19f79590f7713d5685ab1066.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc/processor.h7
-rw-r--r--include/configs/MVBLM7.h5
2 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 5b50679..10fd478 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -970,8 +970,15 @@ struct cpu_type {
struct cpu_type *identify_cpu(u32 ver);
+#if defined(CONFIG_MPC85xx)
#define CPU_TYPE_ENTRY(n, v) \
{ .name = #n, .soc_ver = SVR_##v, }
+#else
+#if defined(CONFIG_MPC83XX)
+#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
+#endif
+#endif
+
#ifndef CONFIG_MACH_SPECIFIC
extern int _machine;
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" \