From 42d1f0394bef0624fc9664714d54bb137931d6a6 Mon Sep 17 00:00:00 2001 From: wdenk Date: Wed, 15 Oct 2003 23:53:47 +0000 Subject: * Patches by Xianghua Xiao, 15 Oct 2003: - Added Motorola CPU 8540/8560 support (cpu/85xx) - Added Motorola MPC8540ADS board support (board/mpc8540ads) - Added Motorola MPC8560ADS board support (board/mpc8560ads) * Minor code cleanup --- board/mpl/vcma9/cmd_vcma9.c | 1 - board/mpl/vcma9/memsetup.S | 8 ++++---- board/mpl/vcma9/vcma9.c | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) (limited to 'board/mpl/vcma9') 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); -- cgit v1.2.3