diff options
Diffstat (limited to 'arch/arm/include/asm/arch-mx6/mx6_plugin.S')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6_plugin.S | 12 |
1 files changed, 10 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 6ee5645..c7a8c9b 100644 --- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S +++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 Freescale Semiconductor, Inc. + * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -17,7 +17,11 @@ #include <config.h> +#ifdef CONFIG_ROM_UNIFIED_SECTIONS +#define ROM_API_TABLE_BASE_ADDR_LEGACY 0x180 +#else #define ROM_API_TABLE_BASE_ADDR_LEGACY 0xC0 +#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 @@ -49,7 +53,11 @@ plugin_start: #ifdef CONFIG_SYS_BOOT_EIMNOR ldr r3, =0x00900800 +#ifdef CONFIG_MX6SX + ldr r4, =0x50000000 +#else ldr r4, =0x08000000 +#endif str r4, [r3, #0xc0] #endif @@ -97,7 +105,7 @@ after_calling_rom___pu_irom_hwcnfg_setup: /* make the following data right in the end of the output*/ .ltorg -#ifdef CONFIG_SYS_BOOT_EIMNOR +#if (defined(CONFIG_SYS_BOOT_EIMNOR) || defined(CONFIG_SYS_BOOT_QSPI)) #define FLASH_OFFSET 0x1000 #else #define FLASH_OFFSET 0x400 |