summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-04-28 16:11:14 +0800
committerNitin Garg <nitin.garg@freescale.com>2014-04-28 09:47:50 -0500
commitd51982ed69309c1bbe95cca72723ce82b24ac717 (patch)
tree9d120cc2d78cc5a02f12adcaa774fa6c2175c97b
parent570c3b1fb86184198bfe1c759825f4b82fd6133c (diff)
downloadu-boot-imx-d51982ed69309c1bbe95cca72723ce82b24ac717.zip
u-boot-imx-d51982ed69309c1bbe95cca72723ce82b24ac717.tar.gz
u-boot-imx-d51982ed69309c1bbe95cca72723ce82b24ac717.tar.bz2
ENGR00310792 iMX6SX Change plugin hack address for booting from EIMNOR
In “include/asm/arch/mx6_plugin.s” the codes commented by “CONFIG_SYS_BOOT_EIMNOR” is the workaround code, and is used to resolve the WEIM plug in boot issue. But the address is updated to "0x900b5c" on PELE ROM, so u-boot plugin code should update accordingly. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit b79672fd60d35cd74fb0e883eab652bb48b3f4cf)
-rw-r--r--arch/arm/include/asm/arch-mx6/mx6_plugin.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S
index c7a8c9b..79b1bf8 100644
--- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S
+++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S
@@ -52,14 +52,16 @@ plugin_start:
adr r2, boot_data2
#ifdef CONFIG_SYS_BOOT_EIMNOR
- ldr r3, =0x00900800
#ifdef CONFIG_MX6SX
+ ldr r3, =0x00900b00
ldr r4, =0x50000000
+ str r4, [r3, #0x5c]
#else
+ ldr r3, =0x00900800
ldr r4, =0x08000000
-#endif
str r4, [r3, #0xc0]
#endif
+#endif
/*
* check the _pu_irom_api_table for the address