diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 05:26:58 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 17:18:03 -0500 |
commit | f7b3a8355ba6cad251297844a0bdd08898ea36e0 (patch) | |
tree | 018eee7bfdbf99961e929644a761354bbea12688 /arch/microblaze | |
parent | 2be09cb993826b52c9fc1d44747c20dd43a50038 (diff) |
of/flattree: Merge early_init_dt_check_for_initrd()
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index a38e3733a09c..7959495b1d00 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -113,38 +113,6 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
113 | return 0; | 113 | return 0; |
114 | } | 114 | } |
115 | 115 | ||
116 | #ifdef CONFIG_BLK_DEV_INITRD | ||
117 | static void __init early_init_dt_check_for_initrd(unsigned long node) | ||
118 | { | ||
119 | unsigned long l; | ||
120 | u32 *prop; | ||
121 | |||
122 | pr_debug("Looking for initrd properties... "); | ||
123 | |||
124 | prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l); | ||
125 | if (prop) { | ||
126 | initrd_start = (unsigned long) | ||
127 | __va((u32)of_read_ulong(prop, l/4)); | ||
128 | |||
129 | prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l); | ||
130 | if (prop) { | ||
131 | initrd_end = (unsigned long) | ||
132 | __va((u32)of_read_ulong(prop, 1/4)); | ||
133 | initrd_below_start_ok = 1; | ||
134 | } else { | ||
135 | initrd_start = 0; | ||
136 | } | ||
137 | } | ||
138 | |||
139 | pr_debug("initrd_start=0x%lx initrd_end=0x%lx\n", | ||
140 | initrd_start, initrd_end); | ||
141 | } | ||
142 | #else | ||
143 | static inline void early_init_dt_check_for_initrd(unsigned long node) | ||
144 | { | ||
145 | } | ||
146 | #endif /* CONFIG_BLK_DEV_INITRD */ | ||
147 | |||
148 | static int __init early_init_dt_scan_chosen(unsigned long node, | 116 | static int __init early_init_dt_scan_chosen(unsigned long node, |
149 | const char *uname, int depth, void *data) | 117 | const char *uname, int depth, void *data) |
150 | { | 118 | { |