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

Fix compiler warnings

Browse Source
This commit is contained in:
Wolfgang Denk 2005-08-05 19:49:35 +02:00
parent cbf9c11728
commit 07a2505f67
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpu/mpc83xx/cpu.c
View File

@ -74,7 +74,10 @@ void upmconfig (uint upm, uint *table, uint size)
int int
do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{ {
ulong msr, addr; ulong msr;
#ifndef MPC83xx_RESET
ulong addr;
#endif
volatile immap_t *immap = (immap_t *) CFG_IMMRBAR; volatile immap_t *immap = (immap_t *) CFG_IMMRBAR;
@ -98,7 +101,9 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
/* perform reset, only one bit */ /* perform reset, only one bit */
immap->reset.rcr = RCR_SWHR; immap->reset.rcr = RCR_SWHR;
#else
#else /* ! MPC83xx_RESET */
immap->reset.rmr = RMR_CSRE; /* Checkstop Reset enable */ immap->reset.rmr = RMR_CSRE; /* Checkstop Reset enable */
/* Interrupts and MMU off */ /* Interrupts and MMU off */
@ -116,7 +121,8 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
printf("resetting the board."); printf("resetting the board.");
printf("\n"); printf("\n");
((void (*)(void)) addr) (); ((void (*)(void)) addr) ();
#endif #endif /* MPC83xx_RESET */
return 1; return 1;
} }