Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Leach <matthew.leach@arm.com>
To: kexec@lists.infradead.org
Cc: Matthew Leach <matthew.leach@arm.com>, will.deacon@arm.com
Subject: [RFC PATCH 2/4] Move libfdt to a generic location
Date: Wed,  5 Sep 2012 12:44:01 +0100	[thread overview]
Message-ID: <1346845443-32242-3-git-send-email-matthew.leach@arm.com> (raw)
In-Reply-To: <1346845443-32242-1-git-send-email-matthew.leach@arm.com>

Move the libfdt library to a more accessible location for other
architectures and update the ppc makefile to reflect these changes.

Signed-off-by: Matthew Leach <matthew.leach@arm.com>
---
 kexec/arch/ppc/Makefile                               | 8 ++++----
 {kexec/arch/ppc => util_lib}/libfdt/Makefile.libfdt   | 8 ++++----
 {kexec/arch/ppc => util_lib}/libfdt/TODO              | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt.c             | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt.h             | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt_ro.c          | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt_rw.c          | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt_strerror.c    | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt_sw.c          | 0
 {kexec/arch/ppc => util_lib}/libfdt/fdt_wip.c         | 0
 {kexec/arch/ppc => util_lib}/libfdt/libfdt.h          | 0
 {kexec/arch/ppc => util_lib}/libfdt/libfdt_env.h      | 0
 {kexec/arch/ppc => util_lib}/libfdt/libfdt_internal.h | 0
 13 files changed, 8 insertions(+), 8 deletions(-)
 rename {kexec/arch/ppc => util_lib}/libfdt/Makefile.libfdt (60%)
 rename {kexec/arch/ppc => util_lib}/libfdt/TODO (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt.h (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt_ro.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt_rw.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt_strerror.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt_sw.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/fdt_wip.c (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/libfdt.h (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/libfdt_env.h (100%)
 rename {kexec/arch/ppc => util_lib}/libfdt/libfdt_internal.h (100%)

diff --git a/kexec/arch/ppc/Makefile b/kexec/arch/ppc/Makefile
index e868917..38f4257 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)/util_lib/libfdt/Makefile.libfdt
 
 ppc_KEXEC_SRCS =  kexec/arch/ppc/kexec-ppc.c
 ppc_KEXEC_SRCS += kexec/arch/ppc/kexec-elf-ppc.c
@@ -13,14 +13,14 @@ ppc_KEXEC_SRCS += kexec/arch/ppc/ppc-setup-dol.S
 ppc_KEXEC_SRCS += kexec/arch/ppc/fixup_dtb.c
 ppc_KEXEC_SRCS += kexec/arch/ppc/fs2dt.c
 ppc_KEXEC_SRCS += kexec/arch/ppc/crashdump-powerpc.c
+ppc_KEXEC_SRCS += kexec/arch/ppc/libfdt-wrapper.c
 
 ppc_UIMAGE = kexec/kexec-uImage.c
 
-libfdt_SRCS = kexec/arch/ppc/libfdt-wrapper.c
-libfdt_SRCS += $(LIBFDT_SRCS:%=kexec/arch/ppc/libfdt/%)
+libfdt_SRCS += $(LIBFDT_SRCS:%=util_lib/libfdt/%)
 ppc_ARCH_REUSE_INITRD =
 
-CPPFLAGS+=-I$(srcdir)/kexec/arch/$(ARCH)/libfdt
+CPPFLAGS+=-I$(srcdir)/util_lib/libfdt
 
 ppc_KEXEC_SRCS += $(libfdt_SRCS)
 
diff --git a/kexec/arch/ppc/libfdt/Makefile.libfdt b/util_lib/libfdt/Makefile.libfdt
similarity index 60%
rename from kexec/arch/ppc/libfdt/Makefile.libfdt
rename to util_lib/libfdt/Makefile.libfdt
index 1d1b295..f34595e 100644
--- a/kexec/arch/ppc/libfdt/Makefile.libfdt
+++ b/util_lib/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 += util_lib/libfdt/Makefile.libfdt				\
+	util_lib/libfdt/fdt.h util_lib/libfdt/libfdt.h	\
+	util_lib/libfdt/libfdt_env.h				\
+	util_lib/libfdt/libfdt_internal.h
diff --git a/kexec/arch/ppc/libfdt/TODO b/util_lib/libfdt/TODO
similarity index 100%
rename from kexec/arch/ppc/libfdt/TODO
rename to util_lib/libfdt/TODO
diff --git a/kexec/arch/ppc/libfdt/fdt.c b/util_lib/libfdt/fdt.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt.c
rename to util_lib/libfdt/fdt.c
diff --git a/kexec/arch/ppc/libfdt/fdt.h b/util_lib/libfdt/fdt.h
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt.h
rename to util_lib/libfdt/fdt.h
diff --git a/kexec/arch/ppc/libfdt/fdt_ro.c b/util_lib/libfdt/fdt_ro.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt_ro.c
rename to util_lib/libfdt/fdt_ro.c
diff --git a/kexec/arch/ppc/libfdt/fdt_rw.c b/util_lib/libfdt/fdt_rw.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt_rw.c
rename to util_lib/libfdt/fdt_rw.c
diff --git a/kexec/arch/ppc/libfdt/fdt_strerror.c b/util_lib/libfdt/fdt_strerror.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt_strerror.c
rename to util_lib/libfdt/fdt_strerror.c
diff --git a/kexec/arch/ppc/libfdt/fdt_sw.c b/util_lib/libfdt/fdt_sw.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt_sw.c
rename to util_lib/libfdt/fdt_sw.c
diff --git a/kexec/arch/ppc/libfdt/fdt_wip.c b/util_lib/libfdt/fdt_wip.c
similarity index 100%
rename from kexec/arch/ppc/libfdt/fdt_wip.c
rename to util_lib/libfdt/fdt_wip.c
diff --git a/kexec/arch/ppc/libfdt/libfdt.h b/util_lib/libfdt/libfdt.h
similarity index 100%
rename from kexec/arch/ppc/libfdt/libfdt.h
rename to util_lib/libfdt/libfdt.h
diff --git a/kexec/arch/ppc/libfdt/libfdt_env.h b/util_lib/libfdt/libfdt_env.h
similarity index 100%
rename from kexec/arch/ppc/libfdt/libfdt_env.h
rename to util_lib/libfdt/libfdt_env.h
diff --git a/kexec/arch/ppc/libfdt/libfdt_internal.h b/util_lib/libfdt/libfdt_internal.h
similarity index 100%
rename from kexec/arch/ppc/libfdt/libfdt_internal.h
rename to util_lib/libfdt/libfdt_internal.h
-- 
1.7.12


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  parent reply	other threads:[~2012-09-05 11:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-05 11:43 [RFC PATCH 0/4] Add device-tree support to kexec-tools for ARM Matthew Leach
2012-09-05 11:44 ` [RFC PATCH 1/4] Fix an overflow bug with address comparison Matthew Leach
2012-09-05 11:44 ` Matthew Leach [this message]
2012-09-05 11:44 ` [RFC PATCH 3/4] Add the dtc for device-tree manipulation Matthew Leach
2012-09-05 11:44 ` [RFC PATCH 4/4] Add device tree support to the ARM platform Matthew Leach
2012-09-05 12:38 ` [RFC PATCH 0/4] Add device-tree support to kexec-tools for ARM Simon Horman
2012-09-05 14:34   ` Matthew Leach
2012-09-06  3:29     ` Simon Horman
2012-09-06  9:01       ` Will Deacon
2012-09-06  9:09         ` Simon Horman
2012-09-06  9:14           ` Will Deacon
2012-09-06 22:03             ` Simon Horman
2012-09-06 11:04       ` Matthew Leach
2012-09-06 11:19         ` Will Deacon
2012-09-06 22:00         ` Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1346845443-32242-3-git-send-email-matthew.leach@arm.com \
    --to=matthew.leach@arm.com \
    --cc=kexec@lists.infradead.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox