Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / powerpc / cpu / mpc83xx / cpu.c

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index f4e25f1f59c39472d0bd853776515617748f501f..49c75a0e5004a2d0a220a57fe10bd1919bd416c6 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -12,12 +12,14 @@
 #include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
+#include <net.h>
 #include <time.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
 #include <mpc83xx.h>
 #include <asm/processor.h>
+#include <linux/delay.h>
 #include <linux/libfdt.h>
 #include <tsec.h>
 #include <netdev.h>
@@ -122,20 +124,13 @@ int checkcpu(void)
 #endif
 
 #ifndef CONFIG_SYSRESET
-int
-do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+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);
@@ -155,24 +150,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