@ -451,22 +451,10 @@ static int reserve_lcd(void)
}
# endif /* CONFIG_LCD */
static int reserve_trace ( void )
{
# ifdef CONFIG_TRACE
gd - > relocaddr - = CONFIG_TRACE_BUFFER_SIZE ;
gd - > trace_buff = map_sysmem ( gd - > relocaddr , CONFIG_TRACE_BUFFER_SIZE ) ;
debug ( " Reserving %dk for trace data at: %08lx \n " ,
CONFIG_TRACE_BUFFER_SIZE > > 10 , gd - > relocaddr ) ;
# endif
return 0 ;
}
# if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \
! defined ( CONFIG_ARM ) & & ! defined ( CONFIG_X86 ) & & \
! defined ( CONFIG_BLACKFIN ) & & ! defined ( CONFIG_M68K )
static int reserve_video ( void )
static int reserve_legacy_video ( void )
{
/* reserve memory for video display (always full pages) */
gd - > relocaddr = video_setmem ( gd - > relocaddr ) ;
@ -476,6 +464,18 @@ static int reserve_video(void)
}
# endif
static int reserve_trace ( void )
{
# ifdef CONFIG_TRACE
gd - > relocaddr - = CONFIG_TRACE_BUFFER_SIZE ;
gd - > trace_buff = map_sysmem ( gd - > relocaddr , CONFIG_TRACE_BUFFER_SIZE ) ;
debug ( " Reserving %dk for trace data at: %08lx \n " ,
CONFIG_TRACE_BUFFER_SIZE > > 10 , gd - > relocaddr ) ;
# endif
return 0 ;
}
static int reserve_uboot ( void )
{
/*
@ -960,13 +960,13 @@ static init_fnc_t init_sequence_f[] = {
# ifdef CONFIG_LCD
reserve_lcd ,
# endif
reserve_trace ,
/* TODO: Why the dependency on CONFIG_8xx? */
# if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \
! defined ( CONFIG_ARM ) & & ! defined ( CONFIG_X86 ) & & \
! defined ( CONFIG_BLACKFIN ) & & ! defined ( CONFIG_M68K )
reserve_video ,
# endif
reserve_trace ,
# if !defined(CONFIG_BLACKFIN)
reserve_uboot ,
# endif