mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
This commit is contained in:
commit
3070a9a3cb
5 changed files with 16 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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" \
|
||||
|
|
Loading…
Add table
Reference in a new issue