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/s5p_goni.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/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 a51215d..0c6e9c7 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 */ |