|
@@ -716,11 +716,40 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
+static void __init early_init_dt_check_for_initrd(unsigned long node)
|
|
|
+{
|
|
|
+ unsigned long l;
|
|
|
+ u32 *prop;
|
|
|
+
|
|
|
+ DBG("Looking for initrd properties... ");
|
|
|
+
|
|
|
+ prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l);
|
|
|
+ if (prop) {
|
|
|
+ initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4));
|
|
|
+
|
|
|
+ prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l);
|
|
|
+ if (prop) {
|
|
|
+ initrd_end = (unsigned long)
|
|
|
+ __va(of_read_ulong(prop, l/4));
|
|
|
+ initrd_below_start_ok = 1;
|
|
|
+ } else {
|
|
|
+ initrd_start = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ DBG("initrd_start=0x%lx initrd_end=0x%lx\n", initrd_start, initrd_end);
|
|
|
+}
|
|
|
+#else
|
|
|
+static inline void early_init_dt_check_for_initrd(unsigned long node)
|
|
|
+{
|
|
|
+}
|
|
|
+#endif /* CONFIG_BLK_DEV_INITRD */
|
|
|
+
|
|
|
static int __init early_init_dt_scan_chosen(unsigned long node,
|
|
|
const char *uname, int depth, void *data)
|
|
|
{
|
|
|
unsigned long *lprop;
|
|
|
- u32 *prop;
|
|
|
unsigned long l;
|
|
|
char *p;
|
|
|
|
|
@@ -762,21 +791,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
|
|
|
crashk_res.end = crashk_res.start + *lprop - 1;
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
- DBG("Looking for initrd properties... ");
|
|
|
- prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l);
|
|
|
- if (prop) {
|
|
|
- initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4));
|
|
|
- prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l);
|
|
|
- if (prop) {
|
|
|
- initrd_end = (unsigned long)__va(of_read_ulong(prop, l/4));
|
|
|
- initrd_below_start_ok = 1;
|
|
|
- } else {
|
|
|
- initrd_start = 0;
|
|
|
- }
|
|
|
- }
|
|
|
- DBG("initrd_start=0x%lx initrd_end=0x%lx\n", initrd_start, initrd_end);
|
|
|
-#endif /* CONFIG_BLK_DEV_INITRD */
|
|
|
+ early_init_dt_check_for_initrd(node);
|
|
|
|
|
|
/* Retreive command line */
|
|
|
p = of_get_flat_dt_prop(node, "bootargs", &l);
|