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

Commit e169cfbe authored by Grant Likely's avatar Grant Likely
Browse files

of/flattree: merge find_flat_dt_string and initial_boot_params 



Merge common code between Microblaze and PowerPC.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Tested-by: default avatarMichal Simek <monstr@monstr.eu>
parent 2cfcadde

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ config CMDLINE_FORCE 


config OF

	def_bool y

	select OF_FLATTREE



config PROC_DEVICETREE

	bool "Support for device tree in /proc"

arch/microblaze/kernel/prom.c

+0 −8
Original line number Diff line number Diff line
@@ -47,17 +47,9 @@ static int __initdata dt_root_size_cells; 


typedef u32 cell_t;



static struct boot_param_header *initial_boot_params;



/* export that to outside world */

struct device_node *of_chosen;



static inline char *find_flat_dt_string(u32 offset)

{

	return ((char *)initial_boot_params) +

		initial_boot_params->off_dt_strings + offset;

}



/**

 * This function is used to scan the flattened device-tree, it is

 * used to extract the memory informations at boot before we can

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ config PPC_OF 


config OF

	def_bool y

	select OF_FLATTREE



config PPC_UDBG_16550

	bool

arch/powerpc/kernel/prom.c

+0 −12
Original line number Diff line number Diff line
@@ -73,12 +73,6 @@ unsigned long tce_alloc_start, tce_alloc_end; 


typedef u32 cell_t;



#if 0

static struct boot_param_header *initial_boot_params __initdata;

#else

struct boot_param_header *initial_boot_params;

#endif



extern struct device_node *allnodes;	/* temporary while merging */



extern rwlock_t devtree_lock;	/* temporary while merging */
@@ -86,12 +80,6 @@ extern rwlock_t devtree_lock; /* temporary while merging */ 
/* export that to outside world */

struct device_node *of_chosen;



static inline char *find_flat_dt_string(u32 offset)

{

	return ((char *)initial_boot_params) +

		initial_boot_params->off_dt_strings + offset;

}



/**

 * This function is used to scan the flattened device-tree, it is

 * used to extract the memory informations at boot before we can

drivers/of/Kconfig

+4 −0
Original line number Diff line number Diff line 
config OF_FLATTREE

	bool

	depends on OF



config OF_DEVICE

	def_bool y

	depends on OF && (SPARC || PPC_OF || MICROBLAZE)