Merge branch 'master' of /home/wd/git/u-boot/custodians

[platform/kernel/u-boot.git] / lib_avr32 / board.c

diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index a407bca..f3d0c52 100644 (file)
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -76,6 +76,50 @@ void *sbrk(ptrdiff_t increment)
        return ((void *)old);
 }
 
+#ifdef CFG_DMA_ALLOC_LEN
+#include <asm/cacheflush.h>
+#include <asm/io.h>
+
+static unsigned long dma_alloc_start;
+static unsigned long dma_alloc_end;
+static unsigned long dma_alloc_brk;
+
+static void dma_alloc_init(void)
+{
+       unsigned long monitor_addr;
+
+       monitor_addr = CFG_MONITOR_BASE + gd->reloc_off;
+       dma_alloc_end = monitor_addr - CFG_MALLOC_LEN;
+       dma_alloc_start = dma_alloc_end - CFG_DMA_ALLOC_LEN;
+       dma_alloc_brk = dma_alloc_start;
+
+       printf("DMA: Using memory from 0x%08lx to 0x%08lx\n",
+              dma_alloc_start, dma_alloc_end);
+
+       dcache_invalidate_range(cached(dma_alloc_start),
+                               dma_alloc_end - dma_alloc_start);
+}
+
+void *dma_alloc_coherent(size_t len, unsigned long *handle)
+{
+       unsigned long paddr = dma_alloc_brk;
+
+       if (dma_alloc_brk + len > dma_alloc_end)
+               return NULL;
+
+       dma_alloc_brk = ((paddr + len + CFG_DCACHE_LINESZ - 1)
+                        & ~(CFG_DCACHE_LINESZ - 1));
+
+       *handle = paddr;
+       return uncached(paddr);
+}
+#else
+static inline void dma_alloc_init(void)
+{
+
+}
+#endif
+
 static int init_baudrate(void)
 {
        char tmp[64];
@@ -179,6 +223,12 @@ void board_init_f(ulong board_type)
        /* Reserve memory for malloc() */
        addr -= CFG_MALLOC_LEN;
 
+#ifdef CFG_DMA_ALLOC_LEN
+       /* Reserve DMA memory (must be cache aligned) */
+       addr &= ~(CFG_DCACHE_LINESZ - 1);
+       addr -= CFG_DMA_ALLOC_LEN;
+#endif
+
        /* Allocate a Board Info struct on a word boundary */
        addr -= sizeof(bd_t);
        addr &= ~3UL;
@@ -211,9 +261,10 @@ void board_init_f(ulong board_type)
 void board_init_r(gd_t *new_gd, ulong dest_addr)
 {
        extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        extern char * env_name_spec;
 #endif
+       char *s;
        cmd_tbl_t *cmdtp;
        bd_t *bd;
 
@@ -251,18 +302,31 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        }
 
        /* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
        env_name_spec += gd->reloc_off;
 #endif
 
        timer_init();
        mem_malloc_init();
        malloc_bin_reloc();
+       dma_alloc_init();
        board_init_info();
-       flash_init();
+
+       enable_interrupts();
+
+       bd->bi_flashstart = 0;
+       bd->bi_flashsize = 0;
+       bd->bi_flashoffset = 0;
+
+#ifndef CFG_NO_FLASH
+       bd->bi_flashstart = CFG_FLASH_BASE;
+       bd->bi_flashsize = flash_init();
+       bd->bi_flashoffset = (unsigned long)_edata - (unsigned long)_text;
 
        if (bd->bi_flashsize)
                display_flash_config();
+#endif
+
        if (bd->bi_dram[0].size)
                display_dram_config();
 
@@ -273,10 +337,26 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
        /* initialize environment */
        env_relocate();
 
+       bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
+
        devices_init();
        jumptable_init();
        console_init_r();
 
+       s = getenv("loadaddr");
+       if (s)
+               load_addr = simple_strtoul(s, NULL, 16);
+
+#if defined(CONFIG_CMD_NET)
+       s = getenv("bootfile");
+       if (s)
+               copy_filename(BootFile, s, sizeof(BootFile));
+#if defined(CONFIG_NET_MULTI)
+       puts("Net:   ");
+#endif
+       eth_initialize(gd->bd);
+#endif
+
        for (;;) {
                main_loop();
        }