|
@@ -59,11 +59,6 @@
|
|
|
#include <miiphy.h>
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_VF610
|
|
|
-#define VF610_LOWER_BANK_ADDR 0x3F400000
|
|
|
-#define VF610_MALLOC_SIZE (256<<10)
|
|
|
-#endif
|
|
|
-
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
ulong monitor_flash_len;
|
|
@@ -389,12 +384,10 @@ void board_init_f(ulong bootflag)
|
|
|
* reserve memory for U-Boot code, data & bss
|
|
|
* round down to next 4 kB limit
|
|
|
*/
|
|
|
-#ifndef CONFIG_VF610
|
|
|
addr -= gd->mon_len;
|
|
|
addr &= ~(4096 - 1);
|
|
|
|
|
|
debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, addr);
|
|
|
-#endif
|
|
|
#ifndef CONFIG_SPL_BUILD
|
|
|
/*
|
|
|
* reserve memory for malloc() arena
|
|
@@ -465,15 +458,9 @@ void board_init_f(ulong bootflag)
|
|
|
/* Ram ist board specific, so move it to board code ... */
|
|
|
dram_init_banksize();
|
|
|
display_dram_config(); /* and display it */
|
|
|
-#ifndef CONFIG_VF610
|
|
|
gd->relocaddr = addr;
|
|
|
gd->start_addr_sp = addr_sp;
|
|
|
gd->reloc_off = addr - _TEXT_BASE;
|
|
|
-#else
|
|
|
- gd->relocaddr = CONFIG_SYS_TEXT_BASE;
|
|
|
- gd->start_addr_sp = addr_sp;
|
|
|
- gd->reloc_off = 0;
|
|
|
-#endif
|
|
|
debug("relocation Offset is: %08lx\n", gd->reloc_off);
|
|
|
if (new_fdt) {
|
|
|
memcpy(new_fdt, gd->fdt_blob, fdt_size);
|
|
@@ -567,13 +554,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
|
|
|
|
|
|
/* The Malloc area is immediately below the monitor copy in DRAM */
|
|
|
malloc_start = dest_addr - TOTAL_MALLOC_LEN;
|
|
|
-#ifdef CONFIG_VF610
|
|
|
- malloc_start = VF610_LOWER_BANK_ADDR;
|
|
|
- mem_malloc_init (malloc_start, VF610_MALLOC_SIZE);
|
|
|
-#else
|
|
|
- malloc_start = dest_addr - TOTAL_MALLOC_LEN;
|
|
|
mem_malloc_init (malloc_start, TOTAL_MALLOC_LEN);
|
|
|
-#endif
|
|
|
|
|
|
#ifdef CONFIG_ARCH_EARLY_INIT_R
|
|
|
arch_early_init_r();
|