diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-15 13:41:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-15 13:41:04 +0100 |
| commit | f11033e739017c5c4eac55f859b8b222ee8d602c (patch) | |
| tree | 4b07b98f378e685c096937c2aeca06e006698af7 /cpu/ppc4xx/cpu_init.c | |
| parent | ddd4123336aad881f50dc34892ac150cfa8143fe (diff) | |
| parent | ca43ba18e910206ef8063e4b22d282630bff3fd2 (diff) | |
| download | talos-obmc-uboot-f11033e739017c5c4eac55f859b8b222ee8d602c.tar.gz talos-obmc-uboot-f11033e739017c5c4eac55f859b8b222ee8d602c.zip | |
Merge with /home/hs/SC3/u-boot
Some code cleanup.
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 db0559b04d..e2aa867c94 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 */ |
