diff options
| author | Tom Rini <trini@konsulko.com> | 2015-06-08 12:37:02 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-06-08 12:37:02 (GMT) |
| commit | 4d80051b63ff54f6b6f90fceb92cf87ab3401ecb (patch) | |
| tree | aea5bee67c756558fc8c820b4ee04adb75c85146 /include/configs/mx6_common.h | |
| parent | 5bcec545a6ca977ad74ee9fe0f2b335d348b5000 (diff) | |
| parent | 943a3f2ccb71bcb4a6041bc2946129c4d4bb197e (diff) | |
| download | u-boot-fsl-qoriq-4d80051b63ff54f6b6f90fceb92cf87ab3401ecb.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'include/configs/mx6_common.h')
| -rw-r--r-- | include/configs/mx6_common.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 233c6d2..50370e1 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -53,11 +53,19 @@ #define CONFIG_REVISION_TAG /* Boot options */ +#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL)) +#define CONFIG_LOADADDR 0x82000000 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x87800000 +#endif +#else #define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x17800000 #endif +#endif +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + #ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 3 #endif |