diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-26 22:36:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-26 22:36:32 +0200 |
| commit | 45b728cdeef2880ab1e7ebb22eac683900a171a0 (patch) | |
| tree | cf9426acfae560b6a134495298038a4d88ecd3e7 /arch/powerpc/cpu/mpc83xx/start.S | |
| parent | c7da8c19b5f7fd58b5b4b1d247648851af56e1f0 (diff) | |
| parent | 71bd860cce4493c5def07804723661e75271052b (diff) | |
| download | u-boot-imx-45b728cdeef2880ab1e7ebb22eac683900a171a0.zip u-boot-imx-45b728cdeef2880ab1e7ebb22eac683900a171a0.tar.gz u-boot-imx-45b728cdeef2880ab1e7ebb22eac683900a171a0.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'arch/powerpc/cpu/mpc83xx/start.S')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 1b3d618..c7d85a8 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -507,7 +507,7 @@ init_e300_core: /* time t 10 */ lis r3, CONFIG_SYS_IMMR@h #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 ori r4, r4, (SWCRR_SWEN | SWCRR_SWRI | SWCRR_SWPR) @@ -520,7 +520,7 @@ init_e300_core: /* time t 10 */ li r4, -0x55C7 sth r4, SWSRR@l(r3) #else - /* Disable Wathcdog */ + /* Disable Watchdog */ /*-------------------*/ lwz r4, SWCRR(r3) /* Check to see if its enabled for disabling |