diff options
author | Tom Rini <trini@konsulko.com> | 2016-12-18 13:54:25 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-12-18 17:43:20 -0500 |
commit | 8ea05705a70135a94419b0d243666c1b51fe1f8d (patch) | |
tree | 495da728ccebe411445c144fb88ba35041db2096 /include/configs/mx6_common.h | |
parent | 0b4bc1b3ab1850fccbade3e6103f2036f6bdb364 (diff) | |
parent | 854bb75be98ad792ff64c26ae38a1392ea185cd6 (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/mx6_common.h')
-rw-r--r-- | include/configs/mx6_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index d28654b2ed..e79ec21256 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -44,7 +44,8 @@ #define CONFIG_REVISION_TAG /* Boot options */ -#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || defined(CONFIG_MX6UL)) +#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \ + defined(CONFIG_MX6UL) || defined(CONFIG_MX6SLL)) #define CONFIG_LOADADDR 0x82000000 #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x87800000 |