summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-06-04 18:09:39 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-03-09 14:42:37 +0100
commit6b12d252c1dd41953ecf4ad02d606a1a47dc2cc4 (patch)
tree563436005ef3ba571a2c2f325e4dfd5bee1c517b /board
parentfd65a7b46fd7215455effc5c0b8b4797460a283c (diff)
MLK-11036 imx: mx6ul fix plugin build fail and update ddr
Since directory name changed, need to change it in imximage.cfg, or we will get "Can't stat board/freescale/mx6ulevk/plugin.bin". Since this commit 7331a4cc0853722b4c3addf1927a2797f39f5de2 missed to update ddr, here update the plugin code. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg2
-rw-r--r--board/freescale/mx6ul_14x14_evk/imximage.cfg2
-rw-r--r--board/freescale/mx6ul_14x14_evk/plugin.S10
3 files changed, 9 insertions, 5 deletions
diff --git a/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
index 87c4eaa222..2272c8683c 100644
--- a/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
@@ -31,7 +31,7 @@ BOOT_FROM sd
#ifdef CONFIG_USE_PLUGIN
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
-PLUGIN board/freescale/mx6ul_ddr3_arm2/plugin.bin 0x00907000
+PLUGIN board/freescale/mx6ul_14x14_ddr3_arm2/plugin.bin 0x00907000
#else
#ifdef CONFIG_SECURE_BOOT
diff --git a/board/freescale/mx6ul_14x14_evk/imximage.cfg b/board/freescale/mx6ul_14x14_evk/imximage.cfg
index 8bbb1fd511..53088d8e94 100644
--- a/board/freescale/mx6ul_14x14_evk/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_evk/imximage.cfg
@@ -31,7 +31,7 @@ BOOT_FROM sd
#ifdef CONFIG_USE_PLUGIN
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
-PLUGIN board/freescale/mx6ulevk/plugin.bin 0x00907000
+PLUGIN board/freescale/mx6ul_14x14_evk/plugin.bin 0x00907000
#else
#ifdef CONFIG_SECURE_BOOT
diff --git a/board/freescale/mx6ul_14x14_evk/plugin.S b/board/freescale/mx6ul_14x14_evk/plugin.S
index 13b696368d..15f0c29b44 100644
--- a/board/freescale/mx6ul_14x14_evk/plugin.S
+++ b/board/freescale/mx6ul_14x14_evk/plugin.S
@@ -13,8 +13,9 @@
str r1, [r0, #0x4B4]
ldr r1, =0x00000000
str r1, [r0, #0x4AC]
- ldr r1, =0x00000030
+ ldr r1, =0x00000008
str r1, [r0, #0x27C]
+ ldr r1, =0x00000030
str r1, [r0, #0x250]
str r1, [r0, #0x24C]
str r1, [r0, #0x490]
@@ -31,8 +32,9 @@
ldr r1, =0x00020000
str r1, [r0, #0x494]
- ldr r1, =0x00000030
+ ldr r1, =0x00000038
str r1, [r0, #0x280]
+ ldr r1, =0x00000030
str r1, [r0, #0x284]
ldr r1, =0x00020000
@@ -49,7 +51,7 @@
str r1, [r0, #0x1C]
ldr r1, =0xA1390003
str r1, [r0, #0x800]
- ldr r1, =0x00000000
+ ldr r1, =0x00070007
str r1, [r0, #0x80C]
ldr r1, =0x41490145
str r1, [r0, #0x83C]
@@ -65,6 +67,8 @@
str r1, [r0, #0x830]
ldr r1, =0x00922012
str r1, [r0, #0x8C0]
+ ldr r1, =0x00000F00
+ str r1, [r0, #0x858]
ldr r1, =0x00000800
str r1, [r0, #0x8B8]
ldr r1, =0x0002002D