Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72a1381800663e5e7021251917ba6a7839dde0d7

Authored by Ye.Li
1 parent 8b903f5293
Exists in smarc-imx-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 7 additions and 1 deletions Side-by-side Diff

arch/arm/include/asm/arch-mx6/mx6_plugin.S
Diff comments   View file @ 72a1381
... ... @@ -19,13 +19,15 @@
19 19  
20 20 #ifdef CONFIG_ROM_UNIFIED_SECTIONS
21 21 #define ROM_API_TABLE_BASE_ADDR_LEGACY 0x180
  22 +#define ROM_VERSION_OFFSET 0x80
22 23 #else
23 24 #define ROM_API_TABLE_BASE_ADDR_LEGACY 0xC0
  25 +#define ROM_VERSION_OFFSET 0x48
24 26 #endif
25 27 #define ROM_API_TABLE_BASE_ADDR_MX6DQ_TO15 0xC4
26 28 #define ROM_API_TABLE_BASE_ADDR_MX6DL_TO12 0xC4
27 29 #define ROM_API_HWCNFG_SETUP_OFFSET 0x08
28   -#define ROM_VERSION_OFFSET 0x48
  30 +#define ROM_VERSION_TO10 0x10
29 31 #define ROM_VERSION_TO12 0x12
30 32 #define ROM_VERSION_TO15 0x15
31 33  
... ... @@ -53,6 +55,10 @@
53 55  
54 56 #ifdef CONFIG_SYS_BOOT_EIMNOR
55 57 #ifdef CONFIG_MX6SX
  58 + ldr r3, =ROM_VERSION_OFFSET
  59 + ldr r4, [r3]
  60 + cmp r4, #ROM_VERSION_TO10
  61 + bgt before_calling_rom___pu_irom_hwcnfg_setup
56 62 ldr r3, =0x00900b00
57 63 ldr r4, =0x50000000
58 64 str r4, [r3, #0x5c]