aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-24 22:54:49 +0100
committerMark Brown <broonie@linaro.org>2014-07-24 22:54:49 +0100
commitbcddae4453f74e9d1dbc8db78c5c9bc552c600cb (patch)
tree44f433cdce0aea74d1098967ff28454e512f777f /lib
parentbf3738e51576cd0cd8c59ef611734cc423323563 (diff)
parentfc40eed01c76797b6f71c982a782cef2d6ab48a6 (diff)
downloadlinux-linaro-stable-bcddae4453f74e9d1dbc8db78c5c9bc552c600cb.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
Conflicts: drivers/of/fdt.c
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile3
-rw-r--r--lib/fdt_empty_tree.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 9efe480b975e..3def8e1ce905 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -140,7 +140,8 @@ obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o
obj-$(CONFIG_STMP_DEVICE) += stmp_device.o
-libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o
+libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
+ fdt_empty_tree.o
$(foreach file, $(libfdt_files), \
$(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
lib-$(CONFIG_LIBFDT) += $(libfdt_files)
diff --git a/lib/fdt_empty_tree.c b/lib/fdt_empty_tree.c
new file mode 100644
index 000000000000..5d30c58150ad
--- /dev/null
+++ b/lib/fdt_empty_tree.c
@@ -0,0 +1,2 @@
+#include <linux/libfdt_env.h>
+#include "../scripts/dtc/libfdt/fdt_empty_tree.c"