blob: bb7482e9bfab0a219cae1fd73584ecb43e1f1e9b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -81,13 +81,23 @@ extern struct boot_param_header __image_
void __init plat_mem_setup(void)
{
+ void *dtb = NULL;
+
set_io_port_base(KSEG1);
/*
* Load the builtin devicetree. This causes the chosen node to be
- * parsed resulting in our memory appearing
+ * parsed resulting in our memory appearing. fw_passed_dtb is used
+ * by CONFIG_MIPS_APPENDED_RAW_DTB as well.
*/
- __dt_setup_arch(&__image_dtb);
+ if (fw_passed_dtb)
+ dtb = (void *)fw_passed_dtb;
+ else if (__dtb_start != __dtb_end)
+ dtb = (void *)__dtb_start;
+ else
+ dtb = &__image_dtb;
+
+ __dt_setup_arch(dtb);
of_scan_flat_dt(early_init_dt_find_chosen, NULL);
if (chosen_dtb)
|
