commit 7029a24f2cb50ce673eca07cf3982d8357d5a6ec
author Christian Riesch <christian.riesch@omicron.at> Fri Dec 09 09:47:34 2011 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Sat Dec 24 10:23:29 2011 +0100
tree 05a82775e9b927ceaf71e4c34a131cc08afff0ee
parent 92e30c07e02b84a3b63205fcb29ac57defd043f6

spl: display_options.o is required for SPI flash support in SPL

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Mike Frysinger <vapier@gentoo.org>

lib/Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 54708c2..35ba7ff 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -50,6 +50,8 @@
 COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y	+= strmhz.o
 COBJS-$(CONFIG_RBTREE)	+= rbtree.o
+else
+COBJS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += display_options.o
 endif
 
 COBJS-y += ctype.o