diff options
| author | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
| commit | e89d623f099c44b0b166ccf46bce2e6a0b99c984 (patch) | |
| tree | da7fb5d7260b477a976519e580264ba1f86a866b /include/configs/s5p_goni.h | |
| parent | ed8271d11c5c7a31eb49f787fa25eece6b82bb9e (diff) | |
| parent | 3d420cbd355a5f09e4f113eb10579a264a8ef138 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/s5p_goni.h')
| -rw-r--r-- | include/configs/s5p_goni.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index a51215d9ae..0c6e9c7878 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -39,8 +39,9 @@ #define CONFIG_INITRD_TAG #define CONFIG_CMDLINE_EDITING -/* Size of malloc() pool.*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 80 * SZ_1M) +/* Size of malloc() pool before and after relocation */ +#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20)) /* * select serial console configuration @@ -53,6 +54,7 @@ #define CONFIG_MMC #define CONFIG_SDHCI #define CONFIG_S5P_SDHCI +#define SDHCI_MAX_HOSTS 4 /* PWM */ #define CONFIG_PWM 1 @@ -106,7 +108,6 @@ ",12m(modem)"\ ",60m(qboot)\0" -#define CONFIG_BOOTDELAY 1 #define CONFIG_ZERO_BOOTDELAY_CHECK /* partitions definitions */ @@ -283,4 +284,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_OF_LIBFDT + #endif /* __CONFIG_H */ |