LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Wolfgang Denk 2010-05-26 22:36:32 +02:00
parent c7da8c19b5 71bd860cce
commit 45b728cdee
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/powerpc/cpu/mpc83xx/cpu_init.c
View File

@ -65,16 +65,16 @@ void cpu_init_f (volatile immap_t * im)
{ {
__be32 acr_mask = __be32 acr_mask =
#ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */ #ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */
(ACR_PIPE_DEP << ACR_PIPE_DEP_SHIFT) | ACR_PIPE_DEP |
#endif #endif
#ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */ #ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */
(ACR_RPTCNT << ACR_RPTCNT_SHIFT) | ACR_RPTCNT |
#endif #endif
#ifdef CONFIG_SYS_ACR_APARK /* Arbiter address parking mode */ #ifdef CONFIG_SYS_ACR_APARK /* Arbiter address parking mode */
(ACR_APARK << ACR_APARK_SHIFT) | ACR_APARK |
#endif #endif
#ifdef CONFIG_SYS_ACR_PARKM /* Arbiter parking master */ #ifdef CONFIG_SYS_ACR_PARKM /* Arbiter parking master */
(ACR_PARKM << ACR_PARKM_SHIFT) | ACR_PARKM |
#endif #endif
0; 0;
__be32 acr_val = __be32 acr_val =
@ -93,16 +93,16 @@ void cpu_init_f (volatile immap_t * im)
0; 0;
__be32 spcr_mask = __be32 spcr_mask =
#ifdef CONFIG_SYS_SPCR_OPT /* Optimize transactions between CSB and other dev */ #ifdef CONFIG_SYS_SPCR_OPT /* Optimize transactions between CSB and other dev */
(SPCR_OPT << SPCR_OPT_SHIFT) | SPCR_OPT |
#endif #endif
#ifdef CONFIG_SYS_SPCR_TSECEP /* all eTSEC's Emergency priority */ #ifdef CONFIG_SYS_SPCR_TSECEP /* all eTSEC's Emergency priority */
(SPCR_TSECEP << SPCR_TSECEP_SHIFT) | SPCR_TSECEP |
#endif #endif
#ifdef CONFIG_SYS_SPCR_TSEC1EP /* TSEC1 Emergency priority */ #ifdef CONFIG_SYS_SPCR_TSEC1EP /* TSEC1 Emergency priority */
(SPCR_TSEC1EP << SPCR_TSEC1EP_SHIFT) | SPCR_TSEC1EP |
#endif #endif
#ifdef CONFIG_SYS_SPCR_TSEC2EP /* TSEC2 Emergency priority */ #ifdef CONFIG_SYS_SPCR_TSEC2EP /* TSEC2 Emergency priority */
(SPCR_TSEC2EP << SPCR_TSEC2EP_SHIFT) | SPCR_TSEC2EP |
#endif #endif
0; 0;
__be32 spcr_val = __be32 spcr_val =
@ -121,34 +121,34 @@ void cpu_init_f (volatile immap_t * im)
0; 0;
__be32 sccr_mask = __be32 sccr_mask =
#ifdef CONFIG_SYS_SCCR_ENCCM /* Encryption clock mode */ #ifdef CONFIG_SYS_SCCR_ENCCM /* Encryption clock mode */
(SCCR_ENCCM << SCCR_ENCCM_SHIFT) | SCCR_ENCCM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_PCICM /* PCI & DMA clock mode */ #ifdef CONFIG_SYS_SCCR_PCICM /* PCI & DMA clock mode */
(SCCR_PCICM << SCCR_PCICM_SHIFT) | SCCR_PCICM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */ #ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
(SCCR_TSECCM << SCCR_TSECCM_SHIFT) | SCCR_TSECCM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */ #ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
(SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) | SCCR_TSEC1CM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */ #ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
(SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) | SCCR_TSEC2CM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */ #ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
(SCCR_TSEC1ON << SCCR_TSEC1ON_SHIFT) | SCCR_TSEC1ON |
#endif #endif
#ifdef CONFIG_SYS_SCCR_TSEC2ON /* TSEC2 clock switch */ #ifdef CONFIG_SYS_SCCR_TSEC2ON /* TSEC2 clock switch */
(SCCR_TSEC2ON << SCCR_TSEC2ON_SHIFT) | SCCR_TSEC2ON |
#endif #endif
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */ #ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
(SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT) | SCCR_USBMPHCM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */ #ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */
(SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) | SCCR_USBDRCM |
#endif #endif
#ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */ #ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */
(SCCR_SATACM << SCCR_SATACM_SHIFT) | SCCR_SATACM |
#endif #endif
0; 0;
__be32 sccr_val = __be32 sccr_val =

4
arch/powerpc/cpu/mpc83xx/start.S
View File

@ -507,7 +507,7 @@ init_e300_core: /* time t 10 */
lis r3, CONFIG_SYS_IMMR@h lis r3, CONFIG_SYS_IMMR@h
#if defined(CONFIG_WATCHDOG) #if defined(CONFIG_WATCHDOG)
/* Initialise the Wathcdog values and reset it (if req) */ /* Initialise the Watchdog values and reset it (if req) */
/*------------------------------------------------------*/ /*------------------------------------------------------*/
lis r4, CONFIG_SYS_WATCHDOG_VALUE lis r4, CONFIG_SYS_WATCHDOG_VALUE
ori r4, r4, (SWCRR_SWEN | SWCRR_SWRI | SWCRR_SWPR) ori r4, r4, (SWCRR_SWEN | SWCRR_SWRI | SWCRR_SWPR)
@ -520,7 +520,7 @@ init_e300_core: /* time t 10 */
li r4, -0x55C7 li r4, -0x55C7
sth r4, SWSRR@l(r3) sth r4, SWSRR@l(r3)
#else #else
/* Disable Wathcdog */ /* Disable Watchdog */
/*-------------------*/ /*-------------------*/
lwz r4, SWCRR(r3) lwz r4, SWCRR(r3)
/* Check to see if its enabled for disabling /* Check to see if its enabled for disabling