diff options
| author | Anson Huang <Anson.Huang@nxp.com> | 2016-04-26 17:46:33 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-04-29 14:22:05 +0800 |
| commit | 2091a5fee3fb93989631fa59e30cf8298c399acf (patch) | |
| tree | 564c3769e234b9f3c57cc78676b56ae91607354e /board | |
| parent | 2ad1304aec9fdfc4a4c90862aa581b207e2665cb (diff) | |
| download | u-boot-imx-2091a5fee3fb93989631fa59e30cf8298c399acf.zip u-boot-imx-2091a5fee3fb93989631fa59e30cf8298c399acf.tar.gz u-boot-imx-2091a5fee3fb93989631fa59e30cf8298c399acf.tar.bz2 | |
MLK-12705-1 ARM: imx: add support for i.MX7D TO1.2
i.MX7D TO1.2 uses same DDR script as TO1.0,
TO1.1 uses dedicated DDR script.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
(cherry picked from commit 527d57e02b05eb0166dcaa1929e46dd2357a8720)
Diffstat (limited to 'board')
13 files changed, 59 insertions, 59 deletions
diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg index c6ec80c..cbb8ce2 100644 --- a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg @@ -48,12 +48,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -89,12 +83,7 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg index cbb8ce2..c6ec80c 100644 --- a/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg +++ b/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg @@ -48,6 +48,12 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -83,7 +89,12 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000d6e +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg index e38c44c..c0da271 100644 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg @@ -95,11 +95,6 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c -DATA 4 0x3079007c 0x1c1c1c1c -DATA 4 0x30790080 0x1c1c1c1c -DATA 4 0x30790084 0x30301c1c -DATA 4 0x30790088 0x00000030 -DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg index c0da271..e38c44c 100644 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg @@ -95,6 +95,11 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c +DATA 4 0x3079007c 0x1c1c1c1c +DATA 4 0x30790080 0x1c1c1c1c +DATA 4 0x30790084 0x30301c1c +DATA 4 0x30790088 0x00000030 +DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S b/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S index d5d116e..41ceb69 100644 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S @@ -230,7 +230,7 @@ TUNE_END: cmp r7, #0x10 beq 2f - /* TO1.1 */ + /* from TO1.1 */ ldr r7, [r11] bic r7, r7, #(1 << 27) str r7, [r11] @@ -269,8 +269,8 @@ TUNE_END: ldr r7, [r1, #0x800] and r7, r7, #0xFF - cmp r7, #0x10 - beq 4f + cmp r7, #0x11 + bne 4f ldr r6, =0x7c ldr r7, =0x1c1c1c1c diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg index 29007f5..2d6c025 100644 --- a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg @@ -50,12 +50,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -91,12 +85,7 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg index 2d6c025..29007f5 100644 --- a/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg +++ b/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg @@ -50,6 +50,12 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -85,7 +91,12 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000d6e +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg index 253b7cd..dd16856 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg @@ -92,11 +92,6 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c -DATA 4 0x3079007c 0x1c1c1c1c -DATA 4 0x30790080 0x1c1c1c1c -DATA 4 0x30790084 0x30301c1c -DATA 4 0x30790088 0x00000030 -DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg index dd16856..253b7cd 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg @@ -92,6 +92,11 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c +DATA 4 0x3079007c 0x1c1c1c1c +DATA 4 0x30790080 0x1c1c1c1c +DATA 4 0x30790084 0x30301c1c +DATA 4 0x30790088 0x00000030 +DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg index ab49d57..171d2ad 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg @@ -96,12 +96,7 @@ DATA 4 0x30790010 0x00050408 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009C 0x00000dee -DATA 4 0x3079007c 0x08080808 -DATA 4 0x30790080 0x08080808 -DATA 4 0x30790084 0x0a0a0808 -DATA 4 0x30790088 0x0000000a -DATA 4 0x3079006c 0x0a0a0a0a +DATA 4 0x3079009C 0x00000d6e DATA 4 0x30790018 0x0000000f DATA 4 0x30790030 0x06060606 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg index 171d2ad..ab49d57 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg @@ -96,7 +96,12 @@ DATA 4 0x30790010 0x00050408 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009C 0x00000d6e +DATA 4 0x3079009C 0x00000dee +DATA 4 0x3079007c 0x08080808 +DATA 4 0x30790080 0x08080808 +DATA 4 0x30790084 0x0a0a0808 +DATA 4 0x30790088 0x0000000a +DATA 4 0x3079006c 0x0a0a0a0a DATA 4 0x30790018 0x0000000f DATA 4 0x30790030 0x06060606 diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg index 1182613..ccf639c 100644 --- a/board/freescale/mx7dsabresd/imximage.cfg +++ b/board/freescale/mx7dsabresd/imximage.cfg @@ -50,12 +50,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 /* Clear then set bit30 to ensure exit from DDR retention */ DATA 4 0x30360388 0x40000000 @@ -96,12 +90,7 @@ DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 DATA 4 0x307900b0 0x1010007e -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7dsabresd/imximage_TO_1_0.cfg b/board/freescale/mx7dsabresd/imximage_TO_1_1.cfg index 588474f..106c277 100644 --- a/board/freescale/mx7dsabresd/imximage_TO_1_0.cfg +++ b/board/freescale/mx7dsabresd/imximage_TO_1_1.cfg @@ -50,6 +50,12 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + DATA 4 0x30340004 0x4F400005 /* Clear then set bit30 to ensure exit from DDR retention */ DATA 4 0x30360388 0x40000000 @@ -90,7 +96,12 @@ DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 DATA 4 0x307900b0 0x1010007e -DATA 4 0x3079009c 0x00000d6e +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 |