diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
| commit | 7b0f932bcdfadf37e8d25388b29266faa3d3c824 (patch) | |
| tree | ec1f5f9ccea83367d0e75c360c1532c575d65f44 /common | |
| parent | ce961e341258dc9f78da3c0d64231cf1afdc4e63 (diff) | |
| parent | 99dc5005935070e1680e5f08dd1cd9eee1f2f284 (diff) | |
| download | barebox-7b0f932bcdfadf37e8d25388b29266faa3d3c824.tar.gz barebox-7b0f932bcdfadf37e8d25388b29266faa3d3c824.tar.xz | |
Merge branch 'for-next/mxs'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 282ddbca25..ee5dca7023 100644 --- a/common/Makefile +++ b/common/Makefile @@ -1,5 +1,6 @@ obj-y += memory.o obj-y += memory_display.o +pbl-$(CONFIG_PBL_CONSOLE) += memory_display.o obj-y += clock.o obj-y += console_common.o obj-y += startup.o |