Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / arch / microblaze / lib / board.c

diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index a7c2f7623392fc1fce53dd2eb992a6f74d8620d7..8267191fdec273af042d30f0917ce8e5be6a19a8 100644 (file)
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -5,23 +5,7 @@
  * Michal  SIMEK <monstr@monstr.eu>
  * Yasushi SHOJI <yashi@atmark-techno.com>
  *
- * 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>
@@ -61,6 +45,9 @@ init_fnc_t *init_sequence[] = {
        serial_init,
        console_init_f,
        interrupts_init,
+#ifdef CONFIG_XILINX_TB_WATCHDOG
+       hw_watchdog_init,
+#endif
        timer_init,
        NULL,
 };
@@ -71,15 +58,15 @@ void board_init_f(ulong not_used)
 {
        bd_t *bd;
        init_fnc_t **init_fnc_ptr;
-       gd = (gd_t *) (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET);
-       bd = (bd_t *) (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
+       gd = (gd_t *)(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET);
+       bd = (bd_t *)(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET
                                                - GENERATED_BD_INFO_SIZE);
 #if defined(CONFIG_CMD_FLASH)
        ulong flash_size = 0;
 #endif
        asm ("nop");    /* FIXME gd is not initialize - wait */
-       memset ((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
-       memset ((void *)bd, 0, GENERATED_BD_INFO_SIZE);
+       memset((void *)gd, 0, GENERATED_GBL_DATA_SIZE);
+       memset((void *)bd, 0, GENERATED_BD_INFO_SIZE);
        gd->bd = bd;
        gd->baudrate = CONFIG_BAUDRATE;
        bd->bi_baudrate = CONFIG_BAUDRATE;
@@ -105,57 +92,55 @@ void board_init_f(ulong not_used)
         * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off
         * as our monitory code is run from SDRAM
         */
-       mem_malloc_init (CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
+       mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
 
        serial_initialize();
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
-               WATCHDOG_RESET ();
-               if ((*init_fnc_ptr) () != 0) {
-                       hang ();
-               }
+               WATCHDOG_RESET();
+               if ((*init_fnc_ptr) () != 0)
+                       hang();
        }
 
 #ifdef CONFIG_OF_CONTROL
        /* For now, put this check after the console is ready */
-       if (fdtdec_prepare_fdt()) {
-               panic("** CONFIG_OF_CONTROL defined but no FDT - please see "
-                       "doc/README.fdt-control");
-       } else
+       if (fdtdec_prepare_fdt())
+               panic("** No FDT - please see doc/README.fdt-control");
+       else
                printf("DTB: 0x%x\n", (u32)gd->fdt_blob);
 #endif
 
-       puts ("SDRAM :\n");
-       printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
-       printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
-       printf ("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE);
+       puts("SDRAM :\n");
+       printf("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
+       printf("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
+       printf("\tU-Boot Start:0x%08x\n", CONFIG_SYS_TEXT_BASE);
 
 #if defined(CONFIG_CMD_FLASH)
-       puts ("Flash: ");
+       puts("Flash: ");
        bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
        flash_size = flash_init();
        if (bd->bi_flashstart && flash_size > 0) {
 # ifdef CONFIG_SYS_FLASH_CHECKSUM
-               print_size (flash_size, "");
+               print_size(flash_size, "");
                /*
                 * Compute and print flash CRC if flashchecksum is set to 'y'
                 *
                 * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
                 */
                if (getenv_yesno("flashchecksum") == 1) {
-                       printf ("  CRC: %08X",
-                               crc32(0, (const u8 *)bd->bi_flashstart,
-                                                       flash_size)
+                       printf("  CRC: %08X",
+                              crc32(0, (const u8 *)bd->bi_flashstart,
+                                    flash_size)
                        );
                }
-               putc ('\n');
+               putc('\n');
 # else /* !CONFIG_SYS_FLASH_CHECKSUM */
-               print_size (flash_size, "\n");
+               print_size(flash_size, "\n");
 # endif /* CONFIG_SYS_FLASH_CHECKSUM */
                bd->bi_flashsize = flash_size;
                bd->bi_flashoffset = bd->bi_flashstart + flash_size;
        } else {
-               puts ("Flash init FAILED");
+               puts("Flash init FAILED");
                bd->bi_flashstart = 0;
                bd->bi_flashsize = 0;
                bd->bi_flashoffset = 0;
@@ -163,10 +148,10 @@ void board_init_f(ulong not_used)
 #endif
 
        /* relocate environment function pointers etc. */
-       env_relocate ();
+       env_relocate();
 
        /* Initialize stdio devices */
-       stdio_init ();
+       stdio_init();
 
        /* Initialize the jump table for applications */
        jumptable_init();
@@ -190,13 +175,7 @@ void board_init_f(ulong not_used)
 
        /* main_loop */
        for (;;) {
-               WATCHDOG_RESET ();
-               main_loop ();
+               WATCHDOG_RESET();
+               main_loop();
        }
 }
-
-void hang (void)
-{
-       puts ("### ERROR ### Please RESET the board ###\n");
-       for (;;) ;
-}