X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Fsh%2Flib%2Fboard.c;h=8498153d4ea3ec26ad4d8e77744cd9453be5e7f2;hb=5b9c79a81db80c3f9e50c77477957cd803429af8;hp=34d7881f446728d1634cbf3e380c3bdf7c9918cf;hpb=8fa3d2b8161bb73b759c9db5c811c885ca5ec60c;p=u-boot

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 34d7881f44..8498153d4e 100644
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -2,20 +2,7 @@
  * Copyright (C) 2007, 2008, 2010
  * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  *
- * 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>
@@ -65,6 +52,7 @@ static int sh_flash_init(void)
 #if defined(CONFIG_WATCHDOG)
 extern int watchdog_init(void);
 extern int watchdog_disable(void);
+# undef INIT_FUNC_WATCHDOG_INIT
 # define INIT_FUNC_WATCHDOG_INIT	watchdog_init,
 # define WATCHDOG_DISABLE       	watchdog_disable
 #else
@@ -199,12 +187,3 @@ void sh_generic_init(void)
 		main_loop();
 	}
 }
-
-/***********************************************************************/
-
-void hang(void)
-{
-	puts("Board ERROR\n");
-	for (;;)
-		;
-}