diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-15 15:18:31 +0100 |
| commit | 6579d15c58e2b6b051f126ea8b77dd767252aa14 (patch) | |
| tree | cac9f9205db8c28a764ad8282d3a909bf95e8db4 /include/configs/mx6qsabre_common.h | |
| parent | c44bb3a30f5a1332176edce1a91c0e2cf666ee8f (diff) | |
| parent | 19a0f7fa271de0345bb2df90d443c547c41e8037 (diff) | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6qsabre_common.h')
| -rw-r--r-- | include/configs/mx6qsabre_common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index d76357c70f7..9eda9ed91a4 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -19,6 +19,9 @@ #define CONFIG_MX6 #define CONFIG_MX6Q + +#include "mx6_common.h" + #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO @@ -171,6 +174,7 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x10010000 +#define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 |