minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only disable the MPC83xx watchdog if its enabled out of reset.

Browse Source 
If its disabled out of reset SW can later enable it if so desired
Patch by Kumar Gala, 11 Jan 2006
This commit is contained in:
Kumar Gala 2006-01-11 11:23:01 -06:00
parent a15b44dbfa
commit ec00c33578
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -2,6 +2,10 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Only disable the MPC83xx watchdog if its enabled out of reset.
If its disabled out of reset SW can later enable it if so desired
Patch by Kumar Gala, 11 Jan 2006
* Allow config of GPIO direction & data registers at boot on 83xx * Allow config of GPIO direction & data registers at boot on 83xx
Patch by Kumar Gala, 11 Jan 2006 Patch by Kumar Gala, 11 Jan 2006

6
cpu/mpc83xx/start.S
View File

@ -426,8 +426,14 @@ init_e300_core: /* time t 10 */
#else #else
/* Disable Wathcdog */ /* Disable Wathcdog */
/*-------------------*/ /*-------------------*/
lwz r4, SWCRR(r3)
/* Check to see if its enabled for disabling
once disabled by SW you can't re-enable */
andi. r4, r4, 0x4
beq 1f
xor r4, r4, r4 xor r4, r4, r4
stw r4, SWCRR(r3) stw r4, SWCRR(r3)
1:
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */
/* Initialize the Hardware Implementation-dependent Registers */ /* Initialize the Hardware Implementation-dependent Registers */