GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Wolfgang Denk 2008-07-07 00:32:47 +02:00
commit 3070a9a3cb
5 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/mvblm7/mvblm7.c
View file

@ -90,7 +90,7 @@ phys_size_t initdram(int board_type)
int checkboard(void) int checkboard(void)
{ {
puts("Board: Matrix Vision mvBlueLYNX-M7 " MV_VERSION "\n"); puts("Board: Matrix Vision mvBlueLYNX-M7\n");
return 0; return 0;
} }

1
cpu/mpc83xx/cpu.c
View file

@ -44,7 +44,6 @@ int checkcpu(void)
char buf[32]; char buf[32];
int i; int i;
#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}
const struct cpu_type { const struct cpu_type {
char name[15]; char name[15];
u32 partid; u32 partid;

5
cpu/mpc83xx/cpu_init.c
View file

@ -181,8 +181,13 @@ void cpu_init_f (volatile immap_t * im)
/* System General Purpose Register */ /* System General Purpose Register */
#ifdef CFG_SICRH #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; im->sysconf.sicrh = CFG_SICRH;
#endif #endif
#endif
#ifdef CFG_SICRL #ifdef CFG_SICRL
im->sysconf.sicrl = CFG_SICRL; im->sysconf.sicrl = CFG_SICRL;
#endif #endif

7
include/asm-ppc/processor.h
View file

@ -970,8 +970,15 @@ struct cpu_type {
struct cpu_type *identify_cpu(u32 ver); struct cpu_type *identify_cpu(u32 ver);
#if defined(CONFIG_MPC85xx)
#define CPU_TYPE_ENTRY(n, v) \ #define CPU_TYPE_ENTRY(n, v) \
{ .name = #n, .soc_ver = SVR_##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 #ifndef CONFIG_MACH_SPECIFIC
extern int _machine; extern int _machine;

5
include/configs/MVBLM7.h
View file

@ -27,7 +27,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define MV_VERSION "v1.0.1" #include <version.h>
/* /*
* High Level Configuration Options * High Level Configuration Options
@ -336,6 +336,7 @@
#define CFG_HID0_FINAL CFG_HID0_INIT #define CFG_HID0_FINAL CFG_HID0_INIT
#define CFG_HID2 HID2_HBE #define CFG_HID2 HID2_HBE
#define CONFIG_HIGH_BATS 1
/* DDR */ /* DDR */
#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) #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=" MV_DTB_ADDR "\0" \
"mv_dtb_addr_ram=" MV_DTB_ADDR_RAM "\0" \ "mv_dtb_addr_ram=" MV_DTB_ADDR_RAM "\0" \
"dtb_name=" MV_DTB_NAME "\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_client_id=" MV_CI "\0" \
"dhcp_vendor-class-identifier=" MV_VCI "\0" \ "dhcp_vendor-class-identifier=" MV_VCI "\0" \
"netretry=no\0" \ "netretry=no\0" \