diff options
Diffstat (limited to 'lib_arm/board.c')
| -rw-r--r-- | lib_arm/board.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib_arm/board.c b/lib_arm/board.c index 47dc53ce1b..b6b5cdb762 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -46,7 +46,10 @@ static ulong mem_malloc_start = 0; static ulong mem_malloc_end = 0; static ulong mem_malloc_brk = 0; -static void mem_malloc_init (ulong dest_addr) +#if !defined(CONFIG_MODEM_SUPPORT) +static +#endif +void mem_malloc_init (ulong dest_addr) { mem_malloc_start = dest_addr; mem_malloc_end = dest_addr + CFG_MALLOC_LEN; @@ -184,7 +187,7 @@ void start_armboot (void) gd_t gd_data; bd_t bd_data; init_fnc_t **init_fnc_ptr; -#ifdef CONFIG_VFD +#if defined(CONFIG_VFD) && !defined(CONFIG_MODEM_SUPPORT) unsigned long addr; #endif @@ -205,6 +208,7 @@ void start_armboot (void) display_flash_config (size); #ifdef CONFIG_VFD +#ifndef CONFIG_MODEM_SUPPORT #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif @@ -219,14 +223,17 @@ void start_armboot (void) addr += size; addr = (addr + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); mem_malloc_init (addr); +#endif /* CONFIG_MODEM_SUPPORT */ #else /* armboot_real_end is defined in the board-specific linker script */ mem_malloc_init (_armboot_real_end); #endif /* CONFIG_VFD */ #ifdef CONFIG_VFD +#ifndef CONFIG_MODEM_SUPPORT /* must do this after the framebuffer is allocated */ drv_vfd_init(); +#endif /* CONFIG_MODEM_SUPPORT */ #endif /* initialize environment */ env_relocate (); |