13 files changed, 9 insertions, 9 deletions
diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile
index e868917..5225a8f 100644
--- a/kexec/arch/ppc/Makefile
+++ b/kexec/arch/ppc/Makefile
@@ -1,7 +1,7 @@
 #
 # kexec ppc (linux booting linux)
 #
-include $(srcdir)/kexec/arch/ppc/libfdt/Makefile.libfdt
+include $(srcdir)/kexec/libfdt/Makefile.libfdt
 
 ppc_KEXEC_SRCS =  kexec/arch/ppc/kexec-ppc.c
 ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c
@@ -16,13 +16,13 @@ ppc_KEXEC_SRCS += kexec/arch/ppc/crashdump-powerpc.c
 
 ppc_UIMAGE = kexec/kexec-uImage.c
 
-libfdt_SRCS = kexec/arch/ppc/libfdt-wrapper.c
-libfdt_SRCS += $(LIBFDT_SRCS:%=kexec/arch/ppc/libfdt/%)
+ppc_libfdt_SRCS = kexec/arch/ppc/libfdt-wrapper.c
+libfdt_SRCS += $(LIBFDT_SRCS:%=kexec/libfdt/%)
 ppc_ARCH_REUSE_INITRD =
 
-CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/libfdt
+CPPFLAGS+=-I$(srcdir)/kexec/libfdt
 
-ppc_KEXEC_SRCS += $(libfdt_SRCS)
+ppc_KEXEC_SRCS += $(libfdt_SRCS) $(ppc_libfdt_SRCS)
 
 dist += kexec/arch/ppc/Makefile $(ppc_KEXEC_SRCS)			\
 	kexec/arch/ppc/crashdump-powerpc.h kexec/arch/ppc/fixup_dtb.h	\
diff --git a/kexec/arch/ppc/libfdt/Makefile.libfdt b/kexec/libfdt/Makefile.libfdt
index 1d1b295..9a2b4f7 100644
--- a/kexec/arch/ppc/libfdt/Makefile.libfdt
+++ b/kexec/libfdt/Makefile.libfdt
@@ -7,7 +7,7 @@ LIBFDT_INCLUDES = fdt.h libfdt.h
 LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
 
-dist += kexec/arch/ppc/libfdt/Makefile.libfdt				\
-	kexec/arch/ppc/libfdt/fdt.h kexec/arch/ppc/libfdt/libfdt.h	\
-	kexec/arch/ppc/libfdt/libfdt_env.h				\
-	kexec/arch/ppc/libfdt/libfdt_internal.h
+dist += kexec/libfdt/Makefile.libfdt			\
+	kexec/libfdt/fdt.h kexec/libfdt/libfdt.h	\
+	kexec/libfdt/libfdt_env.h			\
+	kexec/libfdt/libfdt_internal.h
diff --git a/kexec/arch/ppc/libfdt/TODO b/kexec/libfdt/TODO
index 288437e..288437e 100644
--- a/kexec/arch/ppc/libfdt/TODO
+++ b/kexec/libfdt/TODO
diff --git a/kexec/arch/ppc/libfdt/fdt.c b/kexec/libfdt/fdt.c
index 2acaec5..2acaec5 100644
--- a/kexec/arch/ppc/libfdt/fdt.c
+++ b/kexec/libfdt/fdt.c
diff --git a/kexec/arch/ppc/libfdt/fdt.h b/kexec/libfdt/fdt.h
index 48ccfd9..48ccfd9 100644
--- a/kexec/arch/ppc/libfdt/fdt.h
+++ b/kexec/libfdt/fdt.h
diff --git a/kexec/arch/ppc/libfdt/fdt_ro.c b/kexec/libfdt/fdt_ro.c
index 129b532..129b532 100644
--- a/kexec/arch/ppc/libfdt/fdt_ro.c
+++ b/kexec/libfdt/fdt_ro.c
diff --git a/kexec/arch/ppc/libfdt/fdt_rw.c b/kexec/libfdt/fdt_rw.c
index 8e7ec4c..8e7ec4c 100644
--- a/kexec/arch/ppc/libfdt/fdt_rw.c
+++ b/kexec/libfdt/fdt_rw.c
diff --git a/kexec/arch/ppc/libfdt/fdt_strerror.c b/kexec/libfdt/fdt_strerror.c
index e6c3cee..e6c3cee 100644
--- a/kexec/arch/ppc/libfdt/fdt_strerror.c
+++ b/kexec/libfdt/fdt_strerror.c
diff --git a/kexec/arch/ppc/libfdt/fdt_sw.c b/kexec/libfdt/fdt_sw.c
index 698329e..698329e 100644
--- a/kexec/arch/ppc/libfdt/fdt_sw.c
+++ b/kexec/libfdt/fdt_sw.c
diff --git a/kexec/arch/ppc/libfdt/fdt_wip.c b/kexec/libfdt/fdt_wip.c
index a4652c6..a4652c6 100644
--- a/kexec/arch/ppc/libfdt/fdt_wip.c
+++ b/kexec/libfdt/fdt_wip.c
diff --git a/kexec/arch/ppc/libfdt/libfdt.h b/kexec/libfdt/libfdt.h
index ce80e4f..ce80e4f 100644
--- a/kexec/arch/ppc/libfdt/libfdt.h
+++ b/kexec/libfdt/libfdt.h
diff --git a/kexec/arch/ppc/libfdt/libfdt_env.h b/kexec/libfdt/libfdt_env.h
index 449bf60..449bf60 100644
--- a/kexec/arch/ppc/libfdt/libfdt_env.h
+++ b/kexec/libfdt/libfdt_env.h
diff --git a/kexec/arch/ppc/libfdt/libfdt_internal.h b/kexec/libfdt/libfdt_internal.h
index 46eb93e..46eb93e 100644
--- a/kexec/arch/ppc/libfdt/libfdt_internal.h
+++ b/kexec/libfdt/libfdt_internal.h