diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-20 08:22:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-20 08:22:17 -0400 |
| commit | 023329284dadbbe7e0ed40bcda8101653997e507 (patch) | |
| tree | 45efc945769f2dc390588d8adfa917540d678f2a /arch/powerpc/cpu | |
| parent | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (diff) | |
| parent | b09e1b614949ea9cb426e2e7cf0d2bd65ed7d02d (diff) | |
Merge branch '2020-05-19-misc-fixes'
- Assorted minor fixes
Diffstat (limited to 'arch/powerpc/cpu')
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 24 |
2 files changed, 0 insertions, 28 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 5d7650294d..18808da37d 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -106,10 +106,6 @@ config TARGET_KMCOGE5NE bool "Support kmcoge5ne" select VENDOR_KM -config TARGET_SUVD3 - bool "Support suvd3" - select VENDOR_KM - config TARGET_KMTEGR1 bool "Support kmtegr1" select VENDOR_KM diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index cefbcf6e81..49c75a0e50 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 |