diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-16 15:49:14 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-16 15:49:14 +0100 |
| commit | a195ff95ace5e74e50f54a469d1a160ff84a1089 (patch) | |
| tree | 562292b70faf3cc1298ef87a862658122c752804 /cpu/ppc4xx/cpu_init.c | |
| parent | c2a6e9091fae9e8339c70f4b12cd3f7d5502ae0c (diff) | |
| parent | 1bbbbdd20fcec9933697000dcf55ff7972622596 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu/ppc4xx/cpu_init.c')
| -rw-r--r-- | cpu/ppc4xx/cpu_init.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c index db0559b04d2..e2aa867c941 100644 --- a/cpu/ppc4xx/cpu_init.c +++ b/cpu/ppc4xx/cpu_init.c @@ -219,6 +219,10 @@ void set_chip_gpio_configuration(gpio_param_s (*gpio_tab)[GPIO_GROUP_MAX][GPIO_M void cpu_init_f (void) { +#if defined(CONFIG_WATCHDOG) + unsigned long val; +#endif + #if defined(CONFIG_405EP) /* * GPIO0 setup (select GPIO or alternate function) @@ -309,9 +313,12 @@ cpu_init_f (void) mtebc(pb7cr, CFG_EBC_PB7CR); #endif -#if defined(CONFIG_WATCHDOG) - unsigned long val; +#if defined (CONFIG_SOLIDCARD3) + mtebc(epcr, 0xb84ef000); + *(unsigned long *)0x79000080 = 0x0001; +#endif +#if defined(CONFIG_WATCHDOG) val = mfspr(tcr); #if defined(CONFIG_440EP) || defined(CONFIG_440GR) val |= 0xb8000000; /* generate system reset after 1.34 seconds */ |