forked from Imagelibrary/rtems
2008-05-23 Till Straumann <strauman@slac.stanford.edu>
* shared/startup/pretaskinghook.c: removed declaration of BSP_vme_config() (which is already declared in <bsp/VME.h>. Removed test for NULL-ness of BSP_vme_config; gcc doesn't seem to understand that the linker may define this to be NULL... Silences a compiler warning (and users can always provide an empty routine).
This commit is contained in:
@@ -1,3 +1,12 @@
|
|||||||
|
2008-05-23 Till Straumann <strauman@slac.stanford.edu>
|
||||||
|
|
||||||
|
* shared/startup/pretaskinghook.c: removed declaration
|
||||||
|
of BSP_vme_config() (which is already declared in
|
||||||
|
<bsp/VME.h>. Removed test for NULL-ness of BSP_vme_config;
|
||||||
|
gcc doesn't seem to understand that the linker may
|
||||||
|
define this to be NULL... Silences a compiler warning
|
||||||
|
(and users can always provide an empty routine).
|
||||||
|
|
||||||
2008-05-22 Till Straumann <strauman@slac.stanford.edu>
|
2008-05-22 Till Straumann <strauman@slac.stanford.edu>
|
||||||
|
|
||||||
* shared/startup/linkcmds, shared/startup/zerobss.c:
|
* shared/startup/linkcmds, shared/startup/zerobss.c:
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ void bsp_pretasking_hook(void)
|
|||||||
uint32_t heap_size;
|
uint32_t heap_size;
|
||||||
uint32_t heap_sbrk_spared;
|
uint32_t heap_sbrk_spared;
|
||||||
extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*);
|
extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*);
|
||||||
extern void BSP_vme_config();
|
|
||||||
|
|
||||||
/* make sure it's properly aligned */
|
/* make sure it's properly aligned */
|
||||||
BSP_heap_start = (BSP_heap_start + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT-1);
|
BSP_heap_start = (BSP_heap_start + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT-1);
|
||||||
@@ -71,8 +70,7 @@ void bsp_pretasking_hook(void)
|
|||||||
bsp_libc_init((void *) 0, heap_size, heap_sbrk_spared);
|
bsp_libc_init((void *) 0, heap_size, heap_sbrk_spared);
|
||||||
|
|
||||||
/* Note that VME support may be omitted also by
|
/* Note that VME support may be omitted also by
|
||||||
* providing a NULL BSP_vme_config routine
|
* providing a no-op BSP_vme_config routine
|
||||||
* (e.g., linker script)
|
|
||||||
*/
|
*/
|
||||||
#ifndef BSP_HAS_NO_VME
|
#ifndef BSP_HAS_NO_VME
|
||||||
/*
|
/*
|
||||||
@@ -86,8 +84,7 @@ void bsp_pretasking_hook(void)
|
|||||||
#ifdef SHOW_MORE_INIT_SETTINGS
|
#ifdef SHOW_MORE_INIT_SETTINGS
|
||||||
printk("Going to initialize VME bridge\n");
|
printk("Going to initialize VME bridge\n");
|
||||||
#endif
|
#endif
|
||||||
if ( BSP_vme_config )
|
BSP_vme_config();
|
||||||
BSP_vme_config();
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef SHOW_MORE_INIT_SETTINGS
|
#ifdef SHOW_MORE_INIT_SETTINGS
|
||||||
|
|||||||
Reference in New Issue
Block a user