summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2015-12-04 23:27:38 +0100
committerSimon Glass <sjg@chromium.org>2015-12-13 17:07:30 -0700
commit2b22a99c65c437891ab88703dff25e256f78c21f (patch)
treeee3c720c2ed2de4509a97c495afc588168ef145a /lib/Makefile
parent962a43cc9628fcfc048c563e0fd295b8743e0504 (diff)
lib: Split panic functions out of vsprintf.c
To allow panic and panic_str to still be used when using tiny-printf, split them out into their own file which gets build regardless of what printf implementation is used. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 1f1ff6f2055..ae84833bf3c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -85,13 +85,13 @@ obj-$(CONFIG_LIB_RAND) += rand.o
ifdef CONFIG_SPL_BUILD
# SPL U-Boot may use full-printf, tiny-printf or none at all
ifdef CONFIG_USE_TINY_PRINTF
-obj-$(CONFIG_SPL_SERIAL_SUPPORT) += tiny-printf.o
+obj-$(CONFIG_SPL_SERIAL_SUPPORT) += tiny-printf.o panic.o
else
-obj-$(CONFIG_SPL_SERIAL_SUPPORT) += vsprintf.o
+obj-$(CONFIG_SPL_SERIAL_SUPPORT) += vsprintf.o panic.o
endif
else
# Main U-Boot always uses the full printf support
-obj-y += vsprintf.o
+obj-y += vsprintf.o panic.o
endif
subdir-ccflags-$(CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED) += -O2