diff options
| author | Ye.Li <B37916@freescale.com> | 2014-09-22 15:30:21 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2014-09-23 11:11:29 +0800 |
| commit | 72a1381800663e5e7021251917ba6a7839dde0d7 (patch) | |
| tree | 8370b564770ec657cc0bb13475e7c30cc077c971 | |
| parent | 8b903f529370fdc59cc03b3ced954ed894753044 (diff) | |
| download | u-boot-imx-72a1381800663e5e7021251917ba6a7839dde0d7.zip u-boot-imx-72a1381800663e5e7021251917ba6a7839dde0d7.tar.gz u-boot-imx-72a1381800663e5e7021251917ba6a7839dde0d7.tar.bz2 | |
ENGR00332535 imx: mx6sx: Remove WEIM plugin work around for TO 1.2 and higher
ROM fixes the WEIM plugin issue in TO 1.2. The work around for hacking WEIM base
address to ROM variable is not needed. To avoid hacking useful data, remove the
work around for TO 1.2 and higher revisions.
Signed-off-by: Ye.Li <B37916@freescale.com>
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6_plugin.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S index 7f37048..1f5ae83 100644 --- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S +++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S @@ -19,13 +19,15 @@ #ifdef CONFIG_ROM_UNIFIED_SECTIONS #define ROM_API_TABLE_BASE_ADDR_LEGACY 0x180 +#define ROM_VERSION_OFFSET 0x80 #else #define ROM_API_TABLE_BASE_ADDR_LEGACY 0xC0 +#define ROM_VERSION_OFFSET 0x48 #endif #define ROM_API_TABLE_BASE_ADDR_MX6DQ_TO15 0xC4 #define ROM_API_TABLE_BASE_ADDR_MX6DL_TO12 0xC4 #define ROM_API_HWCNFG_SETUP_OFFSET 0x08 -#define ROM_VERSION_OFFSET 0x48 +#define ROM_VERSION_TO10 0x10 #define ROM_VERSION_TO12 0x12 #define ROM_VERSION_TO15 0x15 @@ -53,6 +55,10 @@ plugin_start: #ifdef CONFIG_SYS_BOOT_EIMNOR #ifdef CONFIG_MX6SX + ldr r3, =ROM_VERSION_OFFSET + ldr r4, [r3] + cmp r4, #ROM_VERSION_TO10 + bgt before_calling_rom___pu_irom_hwcnfg_setup ldr r3, =0x00900b00 ldr r4, =0x50000000 str r4, [r3, #0x5c] |