On Fri, Oct 09, 2009 at 01:07:57AM -0600, Grant Likely wrote: > On Fri, Oct 9, 2009 at 12:35 AM, David Gibson > <david@xxxxxxxxxxxxxxxxxxxxx> wrote: > > On Tue, Oct 06, 2009 at 10:30:59PM -0600, Grant Likely wrote: > >> 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@xxxxxxxxxxxx> > >> --- > >> > >> 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? Yeah, a good question. As I see it there are two options. Number one is just make sure everything relevant that the kernel needs is in the libfdt version, then just have the kernel code reference it from its location in scripts/dtc. Other option is we clone the file in the kernel tree. Requires keeping in sync, in theory at least, but since that file has been pretty static (since it's only supposed to contain passive structures/constants related to the physical flat tree structure - no code or prototypes). -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
