Merge branch 'karo-tx-uboot' into kc-merge

[karo-tx-uboot.git] / arch / arm / lib / reset.c

diff --git a/arch/arm/lib/reset.c b/arch/arm/lib/reset.c
index 08e6acb2615ad5082cc8474e2c2c476ee65da165..18d3e7eeffec16f71f0e5116d0bd66ee9e74eaea 100644 (file)
--- a/arch/arm/lib/reset.c
+++ b/arch/arm/lib/reset.c
@@ -18,27 +18,15 @@
  *
  * (C) Copyright 2004 Texas Insturments
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 
+__weak void reset_misc(void)
+{
+}
+
 int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        puts ("resetting ...\n");
@@ -46,8 +34,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        udelay (50000);                         /* wait 50 ms */
 
        disable_interrupts();
-       reset_cpu(0);
 
-       /*NOTREACHED*/
-       return 0;
+       reset_misc();
+       reset_cpu(0);
+       hang();
 }