aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2009-11-23 16:53:09 -0500
committerGrant Likely <grant.likely@secretlab.ca>2009-11-23 16:53:09 -0500
commite169cfbef46d62e042614ffafa8880eed1d894bb (patch)
tree44982b47e17dc361783d89629fbdde751cbc35e3 /arch/microblaze
parent2cfcadde83b308240690ff1c18f117d8bc7a08b0 (diff)
of/flattree: merge find_flat_dt_string and initial_boot_params
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>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/Kconfig1
-rw-r--r--arch/microblaze/kernel/prom.c8
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index bbd8327f1890..f39c9275a29b 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -111,6 +111,7 @@ config CMDLINE_FORCE
111 111
112config OF 112config OF
113 def_bool y 113 def_bool y
114 select OF_FLATTREE
114 115
115config PROC_DEVICETREE 116config PROC_DEVICETREE
116 bool "Support for device tree in /proc" 117 bool "Support for device tree in /proc"
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index b817df172aa9..06d620ab4168 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -47,17 +47,9 @@ static int __initdata dt_root_size_cells;
47 47
48typedef u32 cell_t; 48typedef u32 cell_t;
49 49
50static struct boot_param_header *initial_boot_params;
51
52/* export that to outside world */ 50/* export that to outside world */
53struct device_node *of_chosen; 51struct device_node *of_chosen;
54 52
55static inline char *find_flat_dt_string(u32 offset)
56{
57 return ((char *)initial_boot_params) +
58 initial_boot_params->off_dt_strings + offset;
59}
60
61/** 53/**
62 * This function is used to scan the flattened device-tree, it is 54 * This function is used to scan the flattened device-tree, it is
63 * used to extract the memory informations at boot before we can 55 * used to extract the memory informations at boot before we can