zlib.c: avoid build conflicts for cradle board

[u-boot] / lib_microblaze / board.c

diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index 4f48341f33be70ed71899663613475e430d2b950..200ea5dd7015c77d6b82dc8f02e68f39a1ca5b5e 100644 (file)
--- a/lib_microblaze/board.c
+++ b/lib_microblaze/board.c
@@ -46,38 +46,6 @@ extern int eth_init (bd_t * bis);
 extern int getenv_IPaddr (char *);
 #endif
 
-/*
- * Begin and End of memory area for malloc(), and current "brk"
- */
-static ulong mem_malloc_start;
-static ulong mem_malloc_end;
-static ulong mem_malloc_brk;
-
-/*
- * The Malloc area is immediately below the monitor copy in DRAM
- * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off
- * as our monitory code is run from SDRAM
- */
-static void mem_malloc_init (void)
-{
-       mem_malloc_end = (CONFIG_SYS_MALLOC_BASE + CONFIG_SYS_MALLOC_LEN);
-       mem_malloc_start = CONFIG_SYS_MALLOC_BASE;
-       mem_malloc_brk = mem_malloc_start;
-       memset ((void *)mem_malloc_start, 0, mem_malloc_end - mem_malloc_start);
-}
-
-void *sbrk (ptrdiff_t increment)
-{
-       ulong old = mem_malloc_brk;
-       ulong new = old + increment;
-
-       if ((new < mem_malloc_start) || (new > mem_malloc_end)) {
-               return (NULL);
-       }
-       mem_malloc_brk = new;
-       return ((void *)old);
-}
-
 /*
  * All attempts to come up with a "common" initialization sequence
  * that works for all boards and architectures failed: some of the
@@ -122,8 +90,12 @@ void board_init (void)
        bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE;
        gd->flags |= GD_FLG_RELOC;      /* tell others: relocation done */
 
-       /* Initialise malloc() area */
-       mem_malloc_init ();
+       /*
+        * The Malloc area is immediately below the monitor copy in DRAM
+        * 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);
 
        for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
                WATCHDOG_RESET ();
@@ -132,11 +104,34 @@ void board_init (void)
                }
        }
 
+       puts ("SDRAM :\n");
+       printf ("\t\tIcache:%s\n", icache_status() ? "OK" : "FAIL");
+       printf ("\t\tDcache:%s\n", dcache_status() ? "OK" : "FAIL");
+       printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE);
+
 #if defined(CONFIG_CMD_FLASH)
+       puts ("FLASH: ");
        bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
        if (0 < (flash_size = flash_init ())) {
                bd->bi_flashsize = flash_size;
                bd->bi_flashoffset = CONFIG_SYS_FLASH_BASE + flash_size;
+# ifdef CONFIG_SYS_FLASH_CHECKSUM
+               print_size (flash_size, "");
+               /*
+                * Compute and print flash CRC if flashchecksum is set to 'y'
+                *
+                * NOTE: Maybe we should add some WATCHDOG_RESET()? XXX
+                */
+               s = getenv ("flashchecksum");
+               if (s && (*s == 'y')) {
+                       printf ("  CRC: %08X",
+                               crc32 (0, (const unsigned char *) CONFIG_SYS_FLASH_BASE, flash_size)
+                       );
+               }
+               putc ('\n');
+# else /* !CONFIG_SYS_FLASH_CHECKSUM */
+               print_size (flash_size, "\n");
+# endif /* CONFIG_SYS_FLASH_CHECKSUM */
        } else {
                puts ("Flash init FAILED");
                bd->bi_flashstart = 0;
@@ -146,15 +141,6 @@ void board_init (void)
 #endif
 
 #if defined(CONFIG_CMD_NET)
-       char *s, *e;
-       int i;
-       /* board MAC address */
-       s = getenv ("ethaddr");
-       for (i = 0; i < 6; ++i) {
-               bd->bi_enetaddr[i] = s ? simple_strtoul (s, &e, 16) : 0;
-               if (s)
-                       s = (*e) ? e + 1 : e;
-       }
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
        eth_init (bd);