Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02564fc8 authored by Tobias Wolf's avatar Tobias Wolf Committed by Ralf Baechle
Browse files

ralink: Introduce fw_passed_dtb to arch/mips/ralink 



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: default avatarTobias Wolf <dev-NTEO@vplace.de>
Acked-by: default avatarJohn Crispin <john@phrozen.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14662/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5e73ad3f

arch/mips/ralink/of.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -66,13 +66,21 @@ static int __init early_init_dt_find_memory(unsigned long node, 




void __init plat_mem_setup(void)

void __init plat_mem_setup(void)

{

{

	void *dtb = NULL;



	set_io_port_base(KSEG1);

	set_io_port_base(KSEG1);





	/*

	/*

	 * Load the builtin devicetree. This causes the chosen node to be

	 * 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);

	of_scan_flat_dt(early_init_dt_find_memory, NULL);

	if (memory_dtb)

	if (memory_dtb)