diff options
| author | Robby Cai <R63905@freescale.com> | 2010-12-21 15:13:29 +0800 |
|---|---|---|
| committer | Robby Cai <R63905@freescale.com> | 2010-12-21 17:27:47 +0800 |
| commit | 09671e589705148725467863a9f84b9011bdfe03 (patch) | |
| tree | c07c23d82bcc6f5a36f77afaf36fbef2ccb76605 | |
| parent | 00bcc7e6fb772a0d195c997287c6795ed0c58fb4 (diff) | |
| download | u-boot-imx-09671e589705148725467863a9f84b9011bdfe03.zip u-boot-imx-09671e589705148725467863a9f84b9011bdfe03.tar.gz u-boot-imx-09671e589705148725467863a9f84b9011bdfe03.tar.bz2 | |
ENGR00137214 MX50: Turn on ZQ calib config by default and fix hang problem
1) Turn on ZQ calib config by default in uboot.
2) Remove one problematic statement which can cause hang issue
3) Change comment style from ; to //
Signed-off-by: Robby Cai <R63905@freescale.com>
| -rw-r--r-- | board/freescale/mx50_rdp/flash_header.S | 46 | ||||
| -rw-r--r-- | include/configs/mx50_arm2.h | 2 | ||||
| -rw-r--r-- | include/configs/mx50_rdp.h | 2 |
3 files changed, 22 insertions, 28 deletions
diff --git a/board/freescale/mx50_rdp/flash_header.S b/board/freescale/mx50_rdp/flash_header.S index 5215ee8..12b1a82 100644 --- a/board/freescale/mx50_rdp/flash_header.S +++ b/board/freescale/mx50_rdp/flash_header.S @@ -40,7 +40,7 @@ pu_loop: cmp r1, #0x20 beq pu_out - ;(pd + 1) << 24 | (pu + 1) << 16 + // (pd + 1) << 24 | (pu + 1) << 16 ldr r2, =0x0 add r2, r2, #0x1 add r1, r1, #0x1 @@ -52,13 +52,11 @@ pu_loop: sub r2, r2, #0x1 sub r1, r1, #0x1 - ;(pd << 8) | pu + // (pd << 8) | pu mov r3, r1 // Set SW_CFG2 str r3, [r0, #0x12c] - sub r1, r1, #0x1 - // Start ZQ comparator ldr r2, =0x10000 str r2, [r0, #0x124] @@ -95,7 +93,7 @@ pd_loop: cmp r2, #0xf beq pd_out - ; (pd + 1) << 24 | (pu + 1) << 16 | 1 << 4 + // (pd + 1) << 24 | (pu + 1) << 16 | 1 << 4 add r2, r2, #0x1 add r1, r1, #0x1 mov r3, r2, lsl #24 @@ -106,7 +104,7 @@ pd_loop: sub r2, r2, #0x1 sub r1, r1, #0x1 - ;(pd << 8) | pu + // (pd << 8) | pu mov r3, r2, LSL #8 orr r3, r3, r1 // Set SW_CFG2 @@ -146,7 +144,7 @@ pd_out: sub r2, r2, #0x2 #if defined(CONFIG_LPDDR2) - ; Pd add 3 + // Pd add 3 add r2, r2, #0x3 /*============================================================================= @@ -157,80 +155,80 @@ pu_loop_pd: cmp r1, #0x20 beq pu_out_pd - ; (pd + 1) << 24 | (pu + 1) << 16 | 1 << 4 + // (pd + 1) << 24 | (pu + 1) << 16 | 1 << 4 add r2, r2, #0x1 add r1, r1, #0x1 mov r3, r2, LSL #24 orr r3, r3, r1, LSL #16 orr r3, r3, #0x10 - ;Set SW_CFG1 + // Set SW_CFG1 str r3, [r0,#0x128] sub r2, r2, #0x1 sub r1, r1, #0x1 - ;(pd << 8) | pu + // (pd << 8) | pu mov r3, r2, LSL #8 orr r3, r3, r1 - ;Set SW_CFG2 + // Set SW_CFG2 str r3, [r0,#0x12c] - ;Start ZQ comparator + // Start ZQ comparator ldr r3, =0x10000 str r3, [r0,#0x124] - ;Delay 300ns at least + // Delay 300ns at least ldr r3, =0x0 pu_delay_pd: add r3, r3, #0x1 cmp r3,#0x1000 bne pu_delay_pd - ;Read compare result + // Read compare result ldr r3, [r0, #0x14c] and r3, r3, #0x1 - ;Stop ZQ comparator + // Stop ZQ comparator ldr r8, =0x0 str r8, [r0,#0x124] - ;Add pu value + // Add pu value add r1, r1, #0x1 cmp r3, #0x1 bne pu_loop_pd pu_out_pd: - ;Pu calibration result in r1 + // Pu calibration result in r1 sub r1, r1, #0x1 #endif /*============================================================================= * Software load PU/PD value,PU is stored in r1, and PD is stored in r2 *===========================================================================*/ - ;(pd << 8) | pu + // (pd << 8) | pu mov r3, r2, LSL #8 orr r3, r3, r1 - ;Set SW_CFG2 + // Set SW_CFG2 str r3, [r0, #0x12c] - ;((pd + 1) << 24) | ((pu + 1) <<16) + // ((pd + 1) << 24) | ((pu + 1) <<16) add r2, r2, #0x1 add r1, r1, #0x1 mov r3, r2, LSL #24 orr r3, r3, r1, LSL #16 - ;Load PU, pu_pd_sel=0 + // Load PU, pu_pd_sel=0 str r3, [r0, #0x128] - ;Set SW_CFG + // Set SW_CFG ldr r1, =0x00310000 str r1, [r0, #0x124] ldr r2, =0x00200000 str r2, [r0, #0x124] - ;Load PD, pu_pd_sel=1 + // Load PD, pu_pd_sel=1 orr r3, r3, #0x10 str r3, [r0, #0x128] - ;Set SW_CFG + // Set SW_CFG str r1, [r0, #0x124] str r2, [r0, #0x124] .endm diff --git a/include/configs/mx50_arm2.h b/include/configs/mx50_arm2.h index 911f18b..930a345 100644 --- a/include/configs/mx50_arm2.h +++ b/include/configs/mx50_arm2.h @@ -167,9 +167,7 @@ /* * DDR ZQ calibration */ -/* #define CONFIG_ZQ_CALIB -*/ /* #define CONFIG_SPLASH_SCREEN diff --git a/include/configs/mx50_rdp.h b/include/configs/mx50_rdp.h index 4317e27..67b2b0a 100644 --- a/include/configs/mx50_rdp.h +++ b/include/configs/mx50_rdp.h @@ -168,9 +168,7 @@ /* * DDR ZQ calibration */ -/* #define CONFIG_ZQ_CALIB -*/ /* * I2C Configs |