Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

of/flattree: merge find_flat_dt_string and initial_boot_params

Browse source 
Merge common code between Microblaze and PowerPC.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Grant Likely 2009-11-23 14:53:09 -07:00
parent 2cfcadde83
commit e169cfbef4
8 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/microblaze/Kconfig
View file

@ -111,6 +111,7 @@ config CMDLINE_FORCE
config OF config OF
def_bool y def_bool y
select OF_FLATTREE
config PROC_DEVICETREE config PROC_DEVICETREE
bool "Support for device tree in /proc" bool "Support for device tree in /proc"

8
arch/microblaze/kernel/prom.c
View file

@ -47,17 +47,9 @@ static int __initdata dt_root_size_cells;
typedef u32 cell_t; typedef u32 cell_t;
static struct boot_param_header *initial_boot_params;
/* export that to outside world */ /* export that to outside world */
struct device_node *of_chosen; 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 * This function is used to scan the flattened device-tree, it is
* used to extract the memory informations at boot before we can * used to extract the memory informations at boot before we can

1
arch/powerpc/Kconfig
View file

@ -163,6 +163,7 @@ config PPC_OF
config OF config OF
def_bool y def_bool y
select OF_FLATTREE
config PPC_UDBG_16550 config PPC_UDBG_16550
bool bool

12
arch/powerpc/kernel/prom.c
View file

@ -73,12 +73,6 @@ unsigned long tce_alloc_start, tce_alloc_end;
typedef u32 cell_t; 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 struct device_node *allnodes; /* temporary while merging */
extern rwlock_t devtree_lock; /* 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 */ /* export that to outside world */
struct device_node *of_chosen; 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 * This function is used to scan the flattened device-tree, it is
* used to extract the memory informations at boot before we can * used to extract the memory informations at boot before we can

4
drivers/of/Kconfig
View file

@ -1,3 +1,7 @@
config OF_FLATTREE
bool
depends on OF
config OF_DEVICE config OF_DEVICE
def_bool y def_bool y
depends on OF && (SPARC || PPC_OF || MICROBLAZE) depends on OF && (SPARC || PPC_OF || MICROBLAZE)

1
drivers/of/Makefile
View file

@ -1,4 +1,5 @@
obj-y = base.o obj-y = base.o
obj-$(CONFIG_OF_FLATTREE) += fdt.o
obj-$(CONFIG_OF_DEVICE) += device.o platform.o obj-$(CONFIG_OF_DEVICE) += device.o platform.o
obj-$(CONFIG_OF_GPIO) += gpio.o obj-$(CONFIG_OF_GPIO) += gpio.o
obj-$(CONFIG_OF_I2C) += of_i2c.o obj-$(CONFIG_OF_I2C) += of_i2c.o

21
drivers/of/fdt.c Normal file
View file

@ -0,0 +1,21 @@
/*
* Functions for working with the Flattened Device Tree data format
*
* Copyright 2009 Benjamin Herrenschmidt, IBM Corp
* benh@kernel.crashing.org
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*/
#include <linux/of.h>
#include <linux/of_fdt.h>
struct boot_param_header *initial_boot_params;
char *find_flat_dt_string(u32 offset)
{
return ((char *)initial_boot_params) +
initial_boot_params->off_dt_strings + offset;
}

4
include/linux/of_fdt.h
View file

@ -57,7 +57,11 @@ struct boot_param_header {
u32 dt_struct_size; /* size of the DT structure block */ u32 dt_struct_size; /* size of the DT structure block */
}; };
/* TBD: Temporary export of fdt globals - remove when code fully merged */
extern struct boot_param_header *initial_boot_params;
/* For scanning the flat device-tree at boot time */ /* For scanning the flat device-tree at boot time */
extern char *find_flat_dt_string(u32 offset);
extern int __init of_scan_flat_dt(int (*it)(unsigned long node, extern int __init of_scan_flat_dt(int (*it)(unsigned long node,
const char *uname, int depth, const char *uname, int depth,
void *data), void *data),