diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /common/Makefile | |
| parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
| download | u-boot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.zip u-boot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.gz u-boot-1739564e753bc3a8097f8937a3cbe738bdaaed5d.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 508a0b2..9c47e20 100644 --- a/common/Makefile +++ b/common/Makefile @@ -252,6 +252,9 @@ obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o obj-y += console.o obj-$(CONFIG_CROS_EC) += cros_ec.o obj-y += dlmalloc.o +ifdef CONFIG_SYS_MALLOC_F_LEN +obj-y += malloc_simple.o +endif obj-y += image.o obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o obj-$(CONFIG_OF_LIBFDT) += image-fdt.o |