Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index 36de78d270877ebaa8727c5db81878d2e135d1f2..cc03f8a01fbe1b1aa3676f44266d5c2fb26265b7 100644 (file)
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -44,7 +44,6 @@ int checkcpu(void)
        char buf[32];
        int i;
 
-#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
        const struct cpu_type {
                char name[15];
                u32 partid;

diff --git a/cpu/mpc83xx/cpu_init.c b/cpu/mpc83xx/cpu_init.c
index fb184d816b62eb74962babb281b2028621ea2095..67c9e570c31d46710c614f3d9ca594d8453d9d9a 100644 (file)
--- a/cpu/mpc83xx/cpu_init.c
+++ b/cpu/mpc83xx/cpu_init.c
@@ -181,8 +181,13 @@ void cpu_init_f (volatile immap_t * im)
 
        /* System General Purpose Register */
 #ifdef CFG_SICRH
+#if defined(CONFIG_MPC834X) || defined(CONFIG_MPC8313)
+       /* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
+       im->sysconf.sicrh = (im->sysconf.sicrh & 0x0000000C) | CFG_SICRH;
+#else
        im->sysconf.sicrh = CFG_SICRH;
 #endif
+#endif
 #ifdef CFG_SICRL
        im->sysconf.sicrl = CFG_SICRL;
 #endif

diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 5b506791a77a258a31262382f96c5851a43cd677..10fd478baba6a91dda629b6d6d1544b0e7d96f40 100644 (file)
--- 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 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"                                         \