This macro is only used (tested for existence) in mpc83xx.c, which unconditionally includes mpc83xx.h where it is unconditionally defined. Removing it makes the remaining code easier to read.

Signed-off-by: Rasmus Villemoes rasmus.villemoes@prevas.dk --- arch/powerpc/cpu/mpc83xx/cpu.c | 24 ------------------------ include/mpc83xx.h | 5 ----- 2 files changed, 29 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 1ecc5ab7ce..118c79c4a3 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -126,16 +126,10 @@ int do_reset (cmd_tbl_t * 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); @@ -155,24 +149,6 @@ do_reset (cmd_tbl_t * 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 c2a185321a..ea67868ea0 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -12,11 +12,6 @@ #include <asm/e300.h> #endif

-/* - * MPC83xx cpu provide RCR register to do reset thing specially - */ -#define MPC83xx_RESET - /* * System reset offset (PowerPC standard) */