diff options
Diffstat (limited to 'cpu/mpc8260/cpu_init.c')
| -rw-r--r-- | cpu/mpc8260/cpu_init.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/cpu/mpc8260/cpu_init.c b/cpu/mpc8260/cpu_init.c index fd09a8d48..babcce4e9 100644 --- a/cpu/mpc8260/cpu_init.c +++ b/cpu/mpc8260/cpu_init.c @@ -98,7 +98,9 @@ static void config_8260_ioports (volatile immap_t * immr)  void cpu_init_f (volatile immap_t * immr)  {  	DECLARE_GLOBAL_DATA_PTR; - +#if !defined(CONFIG_COGENT)		/* done in start.S for the cogent */ +	uint sccr; +#endif  	volatile memctl8260_t *memctl = &immr->im_memctl;  	extern void m8260_cpm_reset (void); @@ -131,7 +133,10 @@ void cpu_init_f (volatile immap_t * immr)  #if !defined(CONFIG_COGENT)		/* done in start.S for the cogent */  	/* System clock control register (9-8) */ -	immr->im_clkrst.car_sccr = CFG_SCCR; +	sccr = immr->im_clkrst.car_sccr & +		(SCCR_PCI_MODE | SCCR_PCI_MODCK | SCCR_PCIDF_MSK); +	immr->im_clkrst.car_sccr = sccr | +		(CFG_SCCR & ~(SCCR_PCI_MODE | SCCR_PCI_MODCK | SCCR_PCIDF_MSK) );  #endif /* !CONFIG_COGENT */  	/* |