From a72491e3070cc8d824c436c53d4312b44fa9f0b3 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 10 Aug 2016 18:20:31 +0800 Subject: [PATCH] MLK-13070 imx: mx6ullevk: Add 9x9 EVK support Add two build configs for i.MX6ULL 9X9 EVK. And update lpddr2 script for the board to version 1.0. DDR script: IMX6ULL_9X9_LPDDR2_400MHz_16bit_V1.0.inc Changes: Initial version Test: Passed memtester overnight test on 1 board. Signed-off-by: Ye Li --- board/freescale/mx6ullevk/imximage_lpddr2.cfg | 18 ++++++++---------- board/freescale/mx6ullevk/plugin.S | 20 +++++++++----------- configs/mx6ull_9x9_evk_defconfig | 5 +++++ configs/mx6ull_9x9_evk_qspi1_defconfig | 5 +++++ 4 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 configs/mx6ull_9x9_evk_defconfig create mode 100644 configs/mx6ull_9x9_evk_qspi1_defconfig diff --git a/board/freescale/mx6ullevk/imximage_lpddr2.cfg b/board/freescale/mx6ullevk/imximage_lpddr2.cfg index 281b05c..05f1bd1 100644 --- a/board/freescale/mx6ullevk/imximage_lpddr2.cfg +++ b/board/freescale/mx6ullevk/imximage_lpddr2.cfg @@ -57,7 +57,6 @@ DATA 4 0x020c4074 0xffffffff DATA 4 0x020c4078 0xffffffff DATA 4 0x020c407c 0xffffffff DATA 4 0x020c4080 0xffffffff -DATA 4 0x020c4084 0xffffffff DATA 4 0x020E04B4 0x00080000 DATA 4 0x020E04AC 0x00000000 @@ -82,7 +81,7 @@ DATA 4 0x020E0248 0x00000030 DATA 4 0x021B001C 0x00008000 DATA 4 0x021B085C 0x1b4700c7 DATA 4 0x021B0800 0xA1390003 -DATA 4 0x021B0890 0x00470000 +DATA 4 0x021B0890 0x23400A38 DATA 4 0x021B08b8 0x00000800 DATA 4 0x021B081C 0x33333333 @@ -90,20 +89,19 @@ DATA 4 0x021B0820 0x33333333 DATA 4 0x021B082C 0xf3333333 DATA 4 0x021B0830 0xf3333333 DATA 4 0x021B083C 0x20000000 -DATA 4 0x021B0848 0x4040484F -DATA 4 0x021B0850 0x40405247 -DATA 4 0x021B08C0 0x00922012 +DATA 4 0x021B0848 0x40403238 +DATA 4 0x021B0850 0x4040322C +DATA 4 0x021B08C0 0x00921012 DATA 4 0x021B08b8 0x00000800 -DATA 4 0x021B0004 0x00020012 +DATA 4 0x021B0004 0x00020052 DATA 4 0x021B0008 0x00000000 DATA 4 0x021B000C 0x33374133 DATA 4 0x021B0010 0x00100A82 DATA 4 0x021B0038 0x00170557 DATA 4 0x021B0014 0x00000093 -DATA 4 0x021B0018 0x00001748 -DATA 4 0x021B001C 0x00008000 -DATA 4 0x021B002C 0x0F9F0682 +DATA 4 0x021B0018 0x00201748 +DATA 4 0x021B002C 0x0F9F26D2 DATA 4 0x021B0030 0x009F0010 DATA 4 0x021B0040 0x00000047 DATA 4 0x021B0000 0x83100000 @@ -115,7 +113,7 @@ DATA 4 0x021B001C 0x01038030 DATA 4 0x021B0020 0x00001800 DATA 4 0x021B0818 0x00000000 DATA 4 0x021B0800 0xA1310003 -DATA 4 0x021B0004 0x00025576 +DATA 4 0x021B0004 0x00025552 DATA 4 0x021B0404 0x00011006 DATA 4 0x021B001C 0x00000000 #endif diff --git a/board/freescale/mx6ullevk/plugin.S b/board/freescale/mx6ullevk/plugin.S index 673c96d..d1dd044 100644 --- a/board/freescale/mx6ullevk/plugin.S +++ b/board/freescale/mx6ullevk/plugin.S @@ -161,7 +161,7 @@ str r1, [r0, #0x85c] ldr r1, =0xA1390003 str r1, [r0, #0x800] - ldr r1, =0x00470000 + ldr r1, =0x23400A38 str r1, [r0, #0x890] ldr r1, =0x00000800 str r1, [r0, #0x8b8] @@ -173,16 +173,16 @@ str r1, [r0, #0x830] ldr r1, =0x20000000 str r1, [r0, #0x83C] - ldr r1, =0x4040484F + ldr r1, =0x40403238 str r1, [r0, #0x848] - ldr r1, =0x40405247 + ldr r1, =0x4040322C str r1, [r0, #0x850] - ldr r1, =0x00922012 + ldr r1, =0x00921012 str r1, [r0, #0x8C0] ldr r1, =0x00000800 str r1, [r0, #0x8B8] - ldr r1, =0x00020012 + ldr r1, =0x00020052 str r1, [r0, #0x004] ldr r1, =0x00000000 str r1, [r0, #0x008] @@ -194,11 +194,9 @@ str r1, [r0, #0x038] ldr r1, =0x00000093 str r1, [r0, #0x014] - ldr r1, =0x00001748 + ldr r1, =0x00201748 str r1, [r0, #0x018] - ldr r1, =0x00008000 - str r1, [r0, #0x01C] - ldr r1, =0x0F9F0682 + ldr r1, =0x0F9F26D2 str r1, [r0, #0x02C] ldr r1, =0x009F0010 str r1, [r0, #0x030] @@ -222,9 +220,9 @@ str r1, [r0, #0x818] ldr r1, =0xA1310003 str r1, [r0, #0x800] - ldr r1, =0x00025576 + ldr r1, =0x00025552 str r1, [r0, #0x004] - ldr r1, =0x00010106 + ldr r1, =0x00011006 str r1, [r0, #0x404] ldr r1, =0x00000000 str r1, [r0, #0x01C] diff --git a/configs/mx6ull_9x9_evk_defconfig b/configs/mx6ull_9x9_evk_defconfig new file mode 100644 index 0000000..358d381 --- /dev/null +++ b/configs/mx6ull_9x9_evk_defconfig @@ -0,0 +1,5 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage_lpddr2.cfg" +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_MX6ULL_9X9_EVK=y +CONFIG_CMD_GPIO=y diff --git a/configs/mx6ull_9x9_evk_qspi1_defconfig b/configs/mx6ull_9x9_evk_qspi1_defconfig new file mode 100644 index 0000000..d2cd3d5 --- /dev/null +++ b/configs/mx6ull_9x9_evk_qspi1_defconfig @@ -0,0 +1,5 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage_lpddr2.cfg,SYS_BOOT_QSPI" +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_MX6ULL_9X9_EVK=y +CONFIG_CMD_GPIO=y -- 1.9.1