Commit fdc36977b33e2e801866ef3279e98bd12bc07b4d
Committed by
Tom Rini
Tom Rini
1 parent
8a7e7d5697
Exists in
master
and in
50 other branches
Makefile: move some libraries to lib/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Showing 2 changed files with 7 additions and 5 deletions Side-by-side Diff
Makefile
| ... | ... | @@ -231,11 +231,6 @@ |
| 231 | 231 | HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) |
| 232 | 232 | |
| 233 | 233 | LIBS-y += lib/ |
| 234 | -LIBS-$(CONFIG_RSA) += lib/rsa/ | |
| 235 | -LIBS-$(CONFIG_LZMA) += lib/lzma/ | |
| 236 | -LIBS-$(CONFIG_LZO) += lib/lzo/ | |
| 237 | -LIBS-$(CONFIG_ZLIB) += lib/zlib/ | |
| 238 | -LIBS-$(CONFIG_TIZEN) += lib/tizen/ | |
| 239 | 234 | LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ |
| 240 | 235 | LIBS-y += $(CPUDIR)/ |
| 241 | 236 | ifdef SOC |
lib/Makefile
| ... | ... | @@ -6,6 +6,13 @@ |
| 6 | 6 | # |
| 7 | 7 | |
| 8 | 8 | ifndef CONFIG_SPL_BUILD |
| 9 | + | |
| 10 | +obj-$(CONFIG_RSA) += rsa/ | |
| 11 | +obj-$(CONFIG_LZMA) += lzma/ | |
| 12 | +obj-$(CONFIG_LZO) += lzo/ | |
| 13 | +obj-$(CONFIG_ZLIB) += zlib/ | |
| 14 | +obj-$(CONFIG_TIZEN) += tizen/ | |
| 15 | + | |
| 9 | 16 | obj-$(CONFIG_AES) += aes.o |
| 10 | 17 | obj-$(CONFIG_BZIP2) += bzlib.o |
| 11 | 18 | obj-$(CONFIG_BZIP2) += bzlib_crctable.o |