summaryrefslogtreecommitdiff
path: root/lib_avr32/board.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib_avr32/board.c')
-rw-r--r--lib_avr32/board.c45
1 files changed, 23 insertions, 22 deletions
diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index 4ed6c966306..959375a48f1 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -23,6 +23,7 @@
#include <command.h>
#include <malloc.h>
#include <devices.h>
+#include <timestamp.h>
#include <version.h>
#include <net.h>
@@ -36,7 +37,7 @@
DECLARE_GLOBAL_DATA_PTR;
const char version_string[] =
- U_BOOT_VERSION " (" __DATE__ " - " __TIME__ ") " CONFIG_IDENT_STRING;
+ U_BOOT_VERSION " ("U_BOOT_DATE" - "U_BOOT_TIME") " CONFIG_IDENT_STRING;
unsigned long monitor_flash_len;
@@ -60,9 +61,9 @@ static void mem_malloc_init(void)
{
unsigned long monitor_addr;
- monitor_addr = CFG_MONITOR_BASE + gd->reloc_off;
+ monitor_addr = CONFIG_SYS_MONITOR_BASE + gd->reloc_off;
mem_malloc_end = monitor_addr;
- mem_malloc_start = mem_malloc_end - CFG_MALLOC_LEN;
+ mem_malloc_start = mem_malloc_end - CONFIG_SYS_MALLOC_LEN;
mem_malloc_brk = mem_malloc_start;
printf("malloc: Using memory from 0x%08lx to 0x%08lx\n",
@@ -84,7 +85,7 @@ void *sbrk(ptrdiff_t increment)
return ((void *)old);
}
-#ifdef CFG_DMA_ALLOC_LEN
+#ifdef CONFIG_SYS_DMA_ALLOC_LEN
#include <asm/cacheflush.h>
#include <asm/io.h>
@@ -96,9 +97,9 @@ 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;
+ monitor_addr = CONFIG_SYS_MONITOR_BASE + gd->reloc_off;
+ dma_alloc_end = monitor_addr - CONFIG_SYS_MALLOC_LEN;
+ dma_alloc_start = dma_alloc_end - CONFIG_SYS_DMA_ALLOC_LEN;
dma_alloc_brk = dma_alloc_start;
printf("DMA: Using memory from 0x%08lx to 0x%08lx\n",
@@ -115,8 +116,8 @@ void *dma_alloc_coherent(size_t len, unsigned long *handle)
if (dma_alloc_brk + len > dma_alloc_end)
return NULL;
- dma_alloc_brk = ((paddr + len + CFG_DCACHE_LINESZ - 1)
- & ~(CFG_DCACHE_LINESZ - 1));
+ dma_alloc_brk = ((paddr + len + CONFIG_SYS_DCACHE_LINESZ - 1)
+ & ~(CONFIG_SYS_DCACHE_LINESZ - 1));
*handle = paddr;
return uncached(paddr);
@@ -218,7 +219,7 @@ void board_init_f(ulong board_type)
* - global data struct
* - stack
*/
- addr = CFG_SDRAM_BASE + sdram_size;
+ addr = CONFIG_SYS_SDRAM_BASE + sdram_size;
monitor_len = _end - _text;
/*
@@ -230,12 +231,12 @@ void board_init_f(ulong board_type)
monitor_addr = addr;
/* Reserve memory for malloc() */
- addr -= CFG_MALLOC_LEN;
+ addr -= CONFIG_SYS_MALLOC_LEN;
-#ifdef CFG_DMA_ALLOC_LEN
+#ifdef CONFIG_SYS_DMA_ALLOC_LEN
/* Reserve DMA memory (must be cache aligned) */
- addr &= ~(CFG_DCACHE_LINESZ - 1);
- addr -= CFG_DMA_ALLOC_LEN;
+ addr &= ~(CONFIG_SYS_DCACHE_LINESZ - 1);
+ addr -= CONFIG_SYS_DMA_ALLOC_LEN;
#endif
/* Allocate a Board Info struct on a word boundary */
@@ -258,7 +259,7 @@ void board_init_f(ulong board_type)
* Initialize the board information struct with the
* information we have.
*/
- bd->bi_dram[0].start = CFG_SDRAM_BASE;
+ bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
bd->bi_dram[0].size = sdram_size;
bd->bi_baudrate = gd->baudrate;
@@ -270,7 +271,7 @@ 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;
@@ -281,7 +282,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
bd = gd->bd;
gd->flags |= GD_FLG_RELOC;
- gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
+ gd->reloc_off = dest_addr - CONFIG_SYS_MONITOR_BASE;
board_early_init_r();
@@ -304,7 +305,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
addr = (unsigned long)cmdtp->usage + gd->reloc_off;
cmdtp->usage = (typeof(cmdtp->usage))addr;
}
-#ifdef CFG_LONGHELP
+#ifdef CONFIG_SYS_LONGHELP
if (cmdtp->help) {
addr = (unsigned long)cmdtp->help + gd->reloc_off;
cmdtp->help = (typeof(cmdtp->help))addr;
@@ -313,7 +314,7 @@ 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
@@ -328,8 +329,8 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
bd->bi_flashsize = 0;
bd->bi_flashoffset = 0;
-#ifndef CFG_NO_FLASH
- bd->bi_flashstart = CFG_FLASH_BASE;
+#ifndef CONFIG_SYS_NO_FLASH
+ bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
bd->bi_flashsize = flash_init();
bd->bi_flashoffset = (unsigned long)_edata - (unsigned long)_text;
@@ -340,7 +341,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
if (bd->bi_dram[0].size)
display_dram_config();
- gd->bd->bi_boot_params = malloc(CFG_BOOTPARAMS_LEN);
+ gd->bd->bi_boot_params = malloc(CONFIG_SYS_BOOTPARAMS_LEN);
if (!gd->bd->bi_boot_params)
puts("WARNING: Cannot allocate space for boot parameters\n");