summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-28 11:13:28 +0900
committerTom Rini <trini@ti.com>2014-12-08 09:35:47 -0500
commit61eb5d72abd3d156baf9de2133226dc5d8da3150 (patch)
tree257fd9f5b7b63b174fd9373e1a4ff8e005686fee
parent77d267502295ffc4d83e80fa175583f8b6460615 (diff)
downloadu-boot-imx-61eb5d72abd3d156baf9de2133226dc5d8da3150.zip
u-boot-imx-61eb5d72abd3d156baf9de2133226dc5d8da3150.tar.gz
u-boot-imx-61eb5d72abd3d156baf9de2133226dc5d8da3150.tar.bz2
libfdt: move CONFIG_OF_LIBFDT and CONFIG_FIT to lib/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--lib/Makefile3
-rw-r--r--lib/libfdt/Makefile5
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile
index e8635ef..3ceb697 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -13,7 +13,8 @@ obj-$(CONFIG_LZO) += lzo/
obj-$(CONFIG_ZLIB) += zlib/
obj-$(CONFIG_BZIP2) += bzip2/
obj-$(CONFIG_TIZEN) += tizen/
-obj-y += libfdt/
+obj-$(CONFIG_OF_LIBFDT) += libfdt/
+obj-$(CONFIG_FIT) += libfdt/
obj-$(CONFIG_AES) += aes.o
obj-$(CONFIG_USB_TTY) += circbuf.o
diff --git a/lib/libfdt/Makefile b/lib/libfdt/Makefile
index 6fe79e0..2f5413f 100644
--- a/lib/libfdt/Makefile
+++ b/lib/libfdt/Makefile
@@ -5,8 +5,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
-COBJS-libfdt += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o \
+obj-y += fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o fdt_wip.o \
fdt_empty_tree.o fdt_addresses.o
-
-obj-$(CONFIG_OF_LIBFDT) += $(COBJS-libfdt)
-obj-$(CONFIG_FIT) += $(COBJS-libfdt)