On Fri, Oct 9, 2009 at 12:35 AM, David Gibson
[off-list ref] wrote:

On Tue, Oct 06, 2009 at 10:30:59PM -0600, Grant Likely wrote:

quoted

Add a common header file for working with the flattened device tree
data structure and merge the shared data tags used by Microblaze and
PowerPC

Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---

 arch/microblaze/include/asm/prom.h |   12 +-----------
 arch/powerpc/include/asm/prom.h    |   12 +-----------
 include/linux/of_fdt.h             |   30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 include/linux/of_fdt.h

diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 64e8b3a..5f461f0 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h

@@ -17,20 +17,10 @@

 #ifndef _ASM_MICROBLAZE_PROM_H
 #define _ASM_MICROBLAZE_PROM_H
 #ifdef __KERNEL__
-
-/* Definitions used by the flattened device tree */
-#define OF_DT_HEADER         0xd00dfeed /* marker */
-#define OF_DT_BEGIN_NODE     0x1 /* Start of node, full name */
-#define OF_DT_END_NODE               0x2 /* End node */
-#define OF_DT_PROP           0x3 /* Property: name off, size, content */
-#define OF_DT_NOP            0x4 /* nop */
-#define OF_DT_END            0x9
-
-#define OF_DT_VERSION                0x10

So, if you're merging all these, I guess the question is do we also
want to merge them with scripts/dtc/libfdt/fdt.h, and by extension
with the upstream libfdt header file which defines the same things.

I see your question and raise you another.  Where should the merge
file live for it to be included both by dtc and kernel code? Or should
it just be cloned in the kernel tree?

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.