diff options
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 24 | ||||
| -rw-r--r-- | include/mpc83xx.h | 5 |
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index cefbcf6..49c75a0 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -127,16 +127,10 @@ int checkcpu(void) int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong msr; -#ifndef MPC83xx_RESET - ulong addr; -#endif - volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR; puts("Resetting the board.\n"); -#ifdef MPC83xx_RESET - /* Interrupts and MMU off */ msr = mfmsr(); msr &= ~(MSR_EE | MSR_IR | MSR_DR); @@ -156,24 +150,6 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) /* perform reset, only one bit */ immap->reset.rcr = RCR_SWHR; -#else /* ! MPC83xx_RESET */ - - immap->reset.rmr = RMR_CSRE; /* Checkstop Reset enable */ - - /* Interrupts and MMU off */ - msr = mfmsr(); - msr &= ~(MSR_ME | MSR_EE | MSR_IR | MSR_DR); - mtmsr(msr); - - /* - * Trying to execute the next instruction at a non-existing address - * should cause a machine check, resulting in reset - */ - addr = CONFIG_SYS_RESET_ADDRESS; - - ((void (*)(void)) addr) (); -#endif /* MPC83xx_RESET */ - return 1; } #endif diff --git a/include/mpc83xx.h b/include/mpc83xx.h index c2a1853..ea67868 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -13,11 +13,6 @@ #endif /* - * MPC83xx cpu provide RCR register to do reset thing specially - */ -#define MPC83xx_RESET - -/* * System reset offset (PowerPC standard) */ #define EXC_OFF_SYS_RESET 0x0100 |