RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

mvme3100/startup/bspstart.c: Remove myCpu variables and clean up

Browse Source
This commit is contained in:
Joel Sherrill
2014-10-13 15:49:46 -05:00
parent 3916cec2a6
commit becc686e19
1 changed files with 217 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
View File

@@ -103,7 +103,6 @@ int i;
printk("\n"); printk("\n");
} }
BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial; BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial;
BSP_polling_getchar_function_type BSP_poll_char = NULL; BSP_polling_getchar_function_type BSP_poll_char = NULL;
@@ -124,8 +123,11 @@ char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
char * save_boot_params(
char * save_boot_params(void* r3, void *r4, void* r5, char *additional_boot_options) void* r3,
void *r4,
void* r5,
char *additional_boot_options)
{ {
strncpy(cmdline_buf, additional_boot_options, CMDLINE_BUF_SIZE); strncpy(cmdline_buf, additional_boot_options, CMDLINE_BUF_SIZE);
@@ -153,10 +155,10 @@ _ccsr_wr32(uint32_t off, uint32_t val)
STATIC uint32_t STATIC uint32_t
BSP_get_mem_size( void ) BSP_get_mem_size( void )
{ {
int i; int i;
uint32_t cs_bnds, cs_config; uint32_t cs_bnds, cs_config;
uint32_t memsz=0; uint32_t memsz=0;
uint32_t v; uint32_t v;
for ( cs_bnds = 0x2000, cs_config=0x2080, i=0; i<4; i++, cs_bnds+=8, cs_config+=4 ) { for ( cs_bnds = 0x2000, cs_config=0x2080, i=0; i<4; i++, cs_bnds+=8, cs_config+=4 ) {
if ( CS_CONFIG_CS_EN & _ccsr_rd32( cs_config ) ) { if ( CS_CONFIG_CS_EN & _ccsr_rd32( cs_config ) ) {
@@ -171,9 +173,9 @@ uint32_t v;
STATIC void STATIC void
BSP_calc_freqs( void ) BSP_calc_freqs( void )
{ {
uint32_t porpllsr = _ccsr_rd32( 0xe0000 ); uint32_t porpllsr = _ccsr_rd32( 0xe0000 );
unsigned plat_ratio = (porpllsr >> (31-30)) & 0x1f; unsigned plat_ratio = (porpllsr >> (31-30)) & 0x1f;
unsigned e500_ratio = (porpllsr >> (31-15)) & 0x3f; unsigned e500_ratio = (porpllsr >> (31-15)) & 0x3f;
switch ( plat_ratio ) { switch ( plat_ratio ) {
case 2: case 3: case 4: case 5: case 6: case 2: case 3: case 4: case 5: case 6:
@@ -218,14 +220,14 @@ SPR_RW(HID1)
void bsp_start( void ) void bsp_start( void )
{ {
unsigned char *stack; unsigned char *stack;
uintptr_t intrStackStart; uintptr_t intrStackStart;
uintptr_t intrStackSize; uintptr_t intrStackSize;
char *chpt; char *chpt;
ppc_cpu_id_t myCpu; int i;
ppc_cpu_revision_t myCpuRevision; ppc_cpu_id_t myCpu;
int i; ppc_cpu_revision_t myCpuRevision;
E500_tlb_va_cache_t *tlb; E500_tlb_va_cache_t *tlb;
VpdBufRec vpdData [] = { VpdBufRec vpdData [] = {
{ key: ProductIdent, instance: 0, buf: BSP_productIdent, buflen: sizeof(BSP_productIdent) - 1 }, { key: ProductIdent, instance: 0, buf: BSP_productIdent, buflen: sizeof(BSP_productIdent) - 1 },
@@ -434,5 +436,4 @@ VpdBufRec vpdData [] = {
#ifdef SHOW_MORE_INIT_SETTINGS #ifdef SHOW_MORE_INIT_SETTINGS
printk("Exit from bspstart\n"); printk("Exit from bspstart\n");
#endif #endif
} }