From: Tobias Wolf Date: Wed, 21 Dec 2016 12:55:43 +0000 (+0100) Subject: ramips: Introduce CONFIG_MIPS_APPENDED_RAW_DTB to arch/mips/ralink X-Git-Tag: v18.06.0-rc1~3839 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=4f866929533e76efa6068dda07eebe6113d67ef6;ds=sidebyside ramips: Introduce CONFIG_MIPS_APPENDED_RAW_DTB to arch/mips/ralink This commit introduces CONFIG_MIPS_APPENDED_RAW_DTB as an alternative to OWRTDTB. Both solutions can be used concurrently until all board configurations have been changed. Signed-off-by: Tobias Wolf [Jo-Philipp Wich: rewrap commit message] Signed-off-by: Jo-Philipp Wich --- diff --git a/target/linux/ramips/patches-4.4/997-ralink-Introduce-fw_passed_dtb-to-arch-mips-ralink.patch b/target/linux/ramips/patches-4.4/997-ralink-Introduce-fw_passed_dtb-to-arch-mips-ralink.patch new file mode 100644 index 0000000000..fb5fd98d13 --- /dev/null +++ b/target/linux/ramips/patches-4.4/997-ralink-Introduce-fw_passed_dtb-to-arch-mips-ralink.patch @@ -0,0 +1,28 @@ +--- a/arch/mips/ralink/of.c ++++ b/arch/mips/ralink/of.c +@@ -81,13 +81,23 @@ + + 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)