diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2008-05-23 21:34:35 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2008-05-23 21:34:35 +0000 |
| commit | 5b9e302c77ebe1d3a987dc435abd8c1f800bad29 (patch) | |
| tree | 1a2fed113e9c7e9b8165c878e1b5622bac979a21 /c | |
| parent | 2008-05-23 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-5b9e302c77ebe1d3a987dc435abd8c1f800bad29.tar.bz2 | |
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).
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 9 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 8b4c853dae..302812bc31 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -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> * shared/startup/linkcmds, shared/startup/zerobss.c: diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c b/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c index ef72f34e36..d137367151 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c @@ -49,7 +49,6 @@ void bsp_pretasking_hook(void) uint32_t heap_size; uint32_t heap_sbrk_spared; extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*); - extern void BSP_vme_config(); /* make sure it's properly aligned */ 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); /* Note that VME support may be omitted also by - * providing a NULL BSP_vme_config routine - * (e.g., linker script) + * providing a no-op BSP_vme_config routine */ #ifndef BSP_HAS_NO_VME /* @@ -86,8 +84,7 @@ void bsp_pretasking_hook(void) #ifdef SHOW_MORE_INIT_SETTINGS printk("Going to initialize VME bridge\n"); #endif - if ( BSP_vme_config ) - BSP_vme_config(); + BSP_vme_config(); #endif #ifdef SHOW_MORE_INIT_SETTINGS |