summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-08-06 12:33:13 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-08-06 12:33:13 +0200
commitb32e327d3e8be662c8d69db8c64e750a9118345a (patch)
tree88a46702863570ce4a4491aa7e28e950205cd44e /lib/Makefile
parenta8525f691dd74f9aa50ecd359408486217e956ba (diff)
parent4f8a7e916aefc83dd690bc39d1d82063ceabf314 (diff)
downloadbarebox-b32e327d3e8be662c8d69db8c64e750a9118345a.tar.gz
barebox-b32e327d3e8be662c8d69db8c64e750a9118345a.tar.xz
Merge branch 'for-next/logo'
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 395214c2bd..abb34cfbdb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -55,3 +55,4 @@ obj-y += bitmap.o
obj-y += gcd.o
obj-y += hexdump.o
obj-$(CONFIG_FONTS) += fonts/
+obj-$(CONFIG_BAREBOX_LOGO) += logo/