diff options
| author | wdenk <wdenk> | 2004-03-14 16:51:43 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-03-14 16:51:43 +0000 |
| commit | 4b248f3f71dc867b0b636b137b044cc762b68486 (patch) | |
| tree | 70b5fc533011958b15296a393fef2ed2c13836d4 /cpu/mpc8260 | |
| parent | aaf224ab4ec400abefa17982cbd2ae995adc9978 (diff) | |
* Patch by Pierre Aubert, 11 Mar 2004:
- add bitmap command and splash screen support in cfb console
- add [optional] origin in the bitmap display command
* Patch by Travis Sawyer, 11 Mar 2004:
Fix ocotea board early init interrupt setup.
* Patch by Thomas Viehweger, 11 Mar 2004:
Remove redundand code; add PCI-specific bits to include/mpc8260.h
Diffstat (limited to 'cpu/mpc8260')
| -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 fd09a8d48fc..babcce4e9b1 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 */ /* |