summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-18 11:17:30 +0900
committerTom Rini <trini@ti.com>2013-11-25 10:41:54 -0500
commitfdc36977b33e2e801866ef3279e98bd12bc07b4d (patch)
treeb5bf8b26e2979ea96042f5c274a68c9d59b40021
parent8a7e7d5697a8b14ec02731d003bed89b1c54dfb7 (diff)
downloadu-boot-imx-fdc36977b33e2e801866ef3279e98bd12bc07b4d.zip
u-boot-imx-fdc36977b33e2e801866ef3279e98bd12bc07b4d.tar.gz
u-boot-imx-fdc36977b33e2e801866ef3279e98bd12bc07b4d.tar.bz2
Makefile: move some libraries to lib/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile5
-rw-r--r--lib/Makefile7
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ed2864c..52133a5 100644
--- a/Makefile
+++ b/Makefile
@@ -231,11 +231,6 @@ OBJS := $(addprefix $(obj),$(OBJS))
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
LIBS-y += lib/
-LIBS-$(CONFIG_RSA) += lib/rsa/
-LIBS-$(CONFIG_LZMA) += lib/lzma/
-LIBS-$(CONFIG_LZO) += lib/lzo/
-LIBS-$(CONFIG_ZLIB) += lib/zlib/
-LIBS-$(CONFIG_TIZEN) += lib/tizen/
LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
LIBS-y += $(CPUDIR)/
ifdef SOC
diff --git a/lib/Makefile b/lib/Makefile
index 4e3b500..e787f77 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,6 +6,13 @@
#
ifndef CONFIG_SPL_BUILD
+
+obj-$(CONFIG_RSA) += rsa/
+obj-$(CONFIG_LZMA) += lzma/
+obj-$(CONFIG_LZO) += lzo/
+obj-$(CONFIG_ZLIB) += zlib/
+obj-$(CONFIG_TIZEN) += tizen/
+
obj-$(CONFIG_AES) += aes.o
obj-$(CONFIG_BZIP2) += bzlib.o
obj-$(CONFIG_BZIP2) += bzlib_crctable.o