diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:37 +0200 |
| commit | 44ebe21a33211961a573a7566801f81423928449 (patch) | |
| tree | 09a64c6af90ac3b60bc3fc4511b3ef172d464582 /common/Makefile | |
| parent | be1ebac4291ddbc6920e63d18ab92292528d1683 (diff) | |
| parent | 842308e29774c577291cae09a8a71ecc3b708b92 (diff) | |
| download | barebox-44ebe21a33211961a573a7566801f81423928449.tar.gz barebox-44ebe21a33211961a573a7566801f81423928449.tar.xz | |
Merge branch 'for-next/memtest'
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 34eb7e41ee..4f430b6ed1 100644 --- a/common/Makefile +++ b/common/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_MALLOC_DLMALLOC) += dlmalloc.o obj-$(CONFIG_MALLOC_TLSF) += tlsf_malloc.o obj-$(CONFIG_MALLOC_TLSF) += tlsf.o obj-$(CONFIG_MALLOC_DUMMY) += dummy_malloc.o +obj-$(CONFIG_CMD_MEMTEST) += memtest.o obj-y += clock.o obj-$(CONFIG_BANNER) += version.o obj-$(CONFIG_MEMINFO) += meminfo.o |