On 13/12/2016 11:46, Tobias Wolf wrote:
> This patch adds fw_passed_dtb to arch/mips/ralink to support
> CONFIG_MIPS_RAW_APPENDED_DTB. Furthermore it adds a check that __dtb_start is
> not the same address as __dtb_end.
>
> Signed-off-by: Tobias Wolf <dev-NTEO@xxxxxxxxx>
> ---
there should be a chunk here explaining the changes between v1 and v2
... anyhow
Acked-by: John Crispin <john@xxxxxxxxxxx>
> --- a/arch/mips/ralink/of.c
> +++ b/arch/mips/ralink/of.c
> @@ -66,13 +66,21 @@
>
> 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(__dtb_start);
> + if (fw_passed_dtb)
> + dtb = (void *)fw_passed_dtb;
> + else if (__dtb_start != __dtb_end)
> + dtb = (void *)__dtb_start;
> +
> + __dt_setup_arch(dtb);
>
> of_scan_flat_dt(early_init_dt_find_memory, NULL);
> if (memory_dtb)
>
> ---
> This version has been cleaned up based on feedback [1] of John Crispin for the
> LEDE Project.
>
> [1] https://github.com/lede-project/source/pull/582#discussion_r90778573
>
> Best regards
> Tobias
>
