aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-14 14:22:55 +0100
committerMark Brown <broonie@linaro.org>2014-08-14 14:22:55 +0100
commit46c2871ba2ca0ef019ea459c45068e711cc456d3 (patch)
tree5aeb8b427609583ef48a720ebf4162b085f33d6f /lib
parent47086094f69a3d03a8898854f09738d5839e995c (diff)
parent5db0038f3a92fd7295d50c132033f14c8e0a80c3 (diff)
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
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 48140e3ba73f..befe5554a34f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -147,7 +147,8 @@ obj-$(CONFIG_GENERIC_NET_UTILS) += net_utils.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"