diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
| commit | ebf8644a113a36b163c2e06fe1e081c73f563c3a (patch) | |
| tree | bdb14d7e33d6c2d1b7a803508e0f45eef301fb7a /include/configs/trats.h | |
| parent | 7d2f669b94aa42579b5d5775dfb076bce0102e3f (diff) | |
| parent | b219773957d2ee8fedb56f0fcb19288eb72d4867 (diff) | |
| download | u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.zip u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.gz u-boot-imx-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/trats.h')
| -rw-r--r-- | include/configs/trats.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h index 43751e7..b21ea2d 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -10,7 +10,7 @@ #ifndef __CONFIG_TRATS_H #define __CONFIG_TRATS_H -#include <configs/exynos4-dt.h> +#include <configs/exynos4-common.h> #define CONFIG_SYS_PROMPT "Trats # " /* Monitor Command Prompt */ @@ -39,10 +39,6 @@ #define CONFIG_SYS_TEXT_BASE 0x63300000 -#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 |