Merge branch 'master' of git://git.denx.de/u-boot-video

[people/ms/u-boot.git] / include / configs / imx6_spl.h

diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 1b9c2773beb8240af44ca465d249f904ac1ae1b2..21c5dce0978fa49caf50fb849f0e14ab292b3a86 100644 (file)
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -61,11 +61,19 @@
 #define CONFIG_SPL_LIBDISK_SUPPORT
 #endif
 
+#if defined(CONFIG_MX6SX)
+#define CONFIG_SPL_BSS_START_ADDR      0x88200000
+#define CONFIG_SPL_BSS_MAX_SIZE        0x100000        /* 1 MB */
+#define CONFIG_SYS_SPL_MALLOC_START    0x88300000
+#define CONFIG_SYS_SPL_MALLOC_SIZE     0x3200000       /* 50 MB */
+#define CONFIG_SYS_TEXT_BASE           0x87800000
+#else
 #define CONFIG_SPL_BSS_START_ADDR      0x18200000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x100000        /* 1 MB */
 #define CONFIG_SYS_SPL_MALLOC_START    0x18300000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x3200000       /* 50 MB */
 #define CONFIG_SYS_TEXT_BASE           0x17800000
 #endif
+#endif
 
 #endif