Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3fc952d authored by Rob Herring's avatar Rob Herring
Browse files

of: push struct boot_param_header and defines into powerpc 



Now powerpc is the only user of struct boot_param_header and FDT defines,
so they can be moved into the powerpc architecture code.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@lists.ozlabs.org
Tested-by: default avatarGrant Likely <grant.likely@linaro.org>
Tested-by: default avatarStephen Chivers <schivers@csc.com>
parent 1daa0c4c

arch/powerpc/include/asm/prom.h

+39 −0
Original line number Diff line number Diff line
@@ -26,6 +26,45 @@ 
#include <linux/of_irq.h>

#include <linux/platform_device.h>



#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



/*

 * This is what gets passed to the kernel by prom_init or kexec

 *

 * The dt struct contains the device tree structure, full pathes and

 * property contents. The dt strings contain a separate block with just

 * the strings for the property names, and is fully page aligned and

 * self contained in a page, so that it can be kept around by the kernel,

 * each property name appears only once in this page (cheap compression)

 *

 * the mem_rsvmap contains a map of reserved ranges of physical memory,

 * passing it here instead of in the device-tree itself greatly simplifies

 * the job of everybody. It's just a list of u64 pairs (base/size) that

 * ends when size is 0

 */

struct boot_param_header {

	__be32	magic;			/* magic word OF_DT_HEADER */

	__be32	totalsize;		/* total size of DT block */

	__be32	off_dt_struct;		/* offset to structure */

	__be32	off_dt_strings;		/* offset to strings */

	__be32	off_mem_rsvmap;		/* offset to memory reserve map */

	__be32	version;		/* format version */

	__be32	last_comp_version;	/* last compatible version */

	/* version 2 fields below */

	__be32	boot_cpuid_phys;	/* Physical CPU id we're booting on */

	/* version 3 fields below */

	__be32	dt_strings_size;	/* size of the DT strings block */

	/* version 17 fields below */

	__be32	dt_struct_size;		/* size of the DT structure block */

};



/*

 * OF address retreival & translation

 */

include/linux/of_fdt.h

+0 −37
Original line number Diff line number Diff line
@@ -17,45 +17,8 @@ 


/* 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



#ifndef __ASSEMBLY__

/*

 * This is what gets passed to the kernel by prom_init or kexec

 *

 * The dt struct contains the device tree structure, full pathes and

 * property contents. The dt strings contain a separate block with just

 * the strings for the property names, and is fully page aligned and

 * self contained in a page, so that it can be kept around by the kernel,

 * each property name appears only once in this page (cheap compression)

 *

 * the mem_rsvmap contains a map of reserved ranges of physical memory,

 * passing it here instead of in the device-tree itself greatly simplifies

 * the job of everybody. It's just a list of u64 pairs (base/size) that

 * ends when size is 0

 */

struct boot_param_header {

	__be32	magic;			/* magic word OF_DT_HEADER */

	__be32	totalsize;		/* total size of DT block */

	__be32	off_dt_struct;		/* offset to structure */

	__be32	off_dt_strings;		/* offset to strings */

	__be32	off_mem_rsvmap;		/* offset to memory reserve map */

	__be32	version;		/* format version */

	__be32	last_comp_version;	/* last compatible version */

	/* version 2 fields below */

	__be32	boot_cpuid_phys;	/* Physical CPU id we're booting on */

	/* version 3 fields below */

	__be32	dt_strings_size;	/* size of the DT strings block */

	/* version 17 fields below */

	__be32	dt_struct_size;		/* size of the DT structure block */

};



#if defined(CONFIG_OF_FLATTREE)