diff options
| author | Tobias Wolf <github-NTEO@vplace.de> | 2016-12-21 13:55:43 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-02-02 00:13:49 +0100 |
| commit | 4f866929533e76efa6068dda07eebe6113d67ef6 (patch) | |
| tree | 53762abca45abe5b0591b356c74e057ef35228f1 | |
| parent | 73d923ed6baabe3f8844f13216c50a6383a79a46 (diff) | |
| download | upstream-4f866929533e76efa6068dda07eebe6113d67ef6.tar.gz upstream-4f866929533e76efa6068dda07eebe6113d67ef6.tar.bz2 upstream-4f866929533e76efa6068dda07eebe6113d67ef6.zip | |
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 <github-NTEO@vplace.de>
[Jo-Philipp Wich: rewrap commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
| -rw-r--r-- | target/linux/ramips/patches-4.4/997-ralink-Introduce-fw_passed_dtb-to-arch-mips-ralink.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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) |