diff options
Diffstat (limited to 'board/mpl')
| -rw-r--r-- | board/mpl/common/flash.c | 9 | ||||
| -rw-r--r-- | board/mpl/vcma9/cmd_vcma9.c | 1 | ||||
| -rw-r--r-- | board/mpl/vcma9/memsetup.S | 8 | ||||
| -rw-r--r-- | board/mpl/vcma9/vcma9.c | 12 |
4 files changed, 14 insertions, 16 deletions
diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c index 98cfb0d318..e56e307160 100644 --- a/board/mpl/common/flash.c +++ b/board/mpl/common/flash.c @@ -86,14 +86,14 @@ void unlock_intel_sectors(flash_info_t *info,ulong addr,ulong cnt); * The first thing we do is to map the Flash CS to the Flash area and * the MPS CS to the MPS area. Since the flash size is unknown at this * point, we use the max flash size and the lowest flash address as base. - * + * * After flash detection we adjust the size of the CS area accordingly. * The board_init_r will fill in wrong values in the board init structure, * but this will be fixed in the misc_init_r routine: * bd->bi_flashstart=0-flash_info[0].size * bd->bi_flashsize=flash_info[0].size-CFG_MONITOR_LEN * bd->bi_flashoffset=0 - * + * */ int get_boot_mode(void) { @@ -152,7 +152,6 @@ void setup_cs_reloc(void) } - unsigned long flash_init (void) { unsigned long size_b0, size_b1,flashcr, size_reg; @@ -207,7 +206,7 @@ unsigned long flash_init (void) case 32: i=5; break; /* = 32MB */ case 64: i=6; break; /* = 64MB */ case 128: i=7; break; /*= 128MB */ - default: + default: printf("\n #### ERROR, wrong size %ld MByte reset board #####\n",size_reg); while(1); } @@ -345,7 +344,7 @@ void flash_print_info (flash_info_t *info) /*----------------------------------------------------------------------- - + */ /* diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c index 3b0453521d..8df642d9ba 100644 --- a/board/mpl/vcma9/cmd_vcma9.c +++ b/board/mpl/vcma9/cmd_vcma9.c @@ -178,4 +178,3 @@ U_BOOT_CMD( "vcma9 - VCMA9 specific commands\n", "flash mem [SrcAddr]\n - updates U-Boot with image in memory\n" ); - diff --git a/board/mpl/vcma9/memsetup.S b/board/mpl/vcma9/memsetup.S index ab6590153c..98aec3db4d 100644 --- a/board/mpl/vcma9/memsetup.S +++ b/board/mpl/vcma9/memsetup.S @@ -153,14 +153,14 @@ memsetup: ldrb r3, [r2, #SDRAM_REG-PLD_BASE] mov r4, #SDRAMDATA1_END-SDRAMDATA /* calculate start and end point */ - mla r0, r3, r4, r0 + mla r0, r3, r4, r0 add r2, r0, r4 0: ldr r3, [r0], #4 str r3, [r1], #4 cmp r2, r0 bne 0b - + /* everything is fine now */ mov pc, lr @@ -194,7 +194,7 @@ SDRAMDATA1_END: .word 0x32 + BURST_EN .word 0x30 .word 0x30 - + /* 2Mx8x4 (not implemented yet) */ .word ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN)) .word ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN)) @@ -202,7 +202,7 @@ SDRAMDATA1_END: .word 0x32 + BURST_EN .word 0x30 .word 0x30 - + /* 4Mx8x2 (not implemented yet) */ .word ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN)) .word ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN)) diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index cdf6163c8c..4664488451 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -190,21 +190,21 @@ nand_init(void) static u8 Get_PLD_ID(void) { VCMA9_PLD * const pld = VCMA9_GetBase_PLD(); - + return(pld->ID); } static u8 Get_PLD_BOARD(void) { VCMA9_PLD * const pld = VCMA9_GetBase_PLD(); - + return(pld->BOARD); } static u8 Get_PLD_SDRAM(void) { VCMA9_PLD * const pld = VCMA9_GetBase_PLD(); - + return(pld->SDRAM); } @@ -253,7 +253,7 @@ static ulong Get_SDRAM_ChipSize(void) case 2: return 8 * (1024*1024); case 3: return 8 * (1024*1024); default: return 0; - } + } } static const char * Get_SDRAM_ChipGeom(void) { @@ -339,10 +339,10 @@ int overwrite_console(void) * Print VCMA9 Info ************************************************************************/ void print_vcma9_info(void) -{ +{ unsigned char s[50]; int i; - + if ((i = getenv_r("serial#", s, 32)) < 0) { puts ("### No HW ID - assuming VCMA9"); printf("i %d", i*24); |
