Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / arch / openrisc / lib / board.c

diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c
index 85aa1899be02776f602772610a579270eaa37526..b7fbd2f125305f21802a68f8a32be312fb33a7fe 100644 (file)
--- a/arch/openrisc/lib/board.c
+++ b/arch/openrisc/lib/board.c
@@ -9,26 +9,11 @@
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  *
- * 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>
+#include <console.h>
 #include <stdio_dev.h>
 #include <watchdog.h>
 #include <malloc.h>
@@ -100,7 +85,6 @@ void board_init(void)
        bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;
        bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;
 #endif
-       bd->bi_baudrate = CONFIG_BAUDRATE;
 
        for (i = 0; i < ARRAY_SIZE(init_sequence); i++) {
                WATCHDOG_RESET();
@@ -145,7 +129,7 @@ void board_init(void)
 
 #if defined(CONFIG_CMD_NET)
        puts("NET:   ");
-       eth_initialize(bd);
+       eth_initialize();
 #endif
 
        /* main_loop */
@@ -154,15 +138,3 @@ void board_init(void)
                main_loop();
        }
 }
-
-
-/***********************************************************************/
-
-void hang(void)
-{
-       disable_interrupts();
-       puts("### ERROR ### Please reset board ###\n");
-
-       for (;;)
-               ;
-}