diff options
author | Tom Rini <trini@ti.com> | 2014-10-11 00:59:28 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-10-11 00:59:28 (GMT) |
commit | e89d623f099c44b0b166ccf46bce2e6a0b99c984 (patch) | |
tree | da7fb5d7260b477a976519e580264ba1f86a866b /include/configs/trats2.h | |
parent | ed8271d11c5c7a31eb49f787fa25eece6b82bb9e (diff) | |
parent | 3d420cbd355a5f09e4f113eb10579a264a8ef138 (diff) | |
download | u-boot-fsl-qoriq-e89d623f099c44b0b166ccf46bce2e6a0b99c984.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/trats2.h')
-rw-r--r-- | include/configs/trats2.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/trats2.h b/include/configs/trats2.h index e9a04f7..42481ab 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -11,7 +11,7 @@ #ifndef __CONFIG_TRATS2_H #define __CONFIG_TRATS2_H -#include <configs/exynos4-dt.h> +#include <configs/exynos4-common.h> #define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ @@ -36,10 +36,6 @@ #define CONFIG_SYS_TEXT_BASE 0x43e00000 -#include <linux/sizes.h> -/* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M)) - /* select serial console configuration */ #define CONFIG_SERIAL2 #define CONFIG_BAUDRATE 115200 |