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

Commit 1efc959e authored by Rob Herring's avatar Rob Herring
Browse files

arc: use unflatten_and_copy_device_tree 



Use the common unflatten_and_copy_device_tree to copy the built-in FDT
out of init section.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
parent a8bf7527

arch/arc/include/asm/mach_desc.h

+0 −1
Original line number Diff line number Diff line
@@ -82,6 +82,5 @@ __attribute__((__section__(".arch.info.init"))) = { \ 
};



extern struct machine_desc *setup_machine_fdt(void *dt);

extern void __init copy_devtree(void);



#endif

arch/arc/kernel/devtree.c

+0 −15
Original line number Diff line number Diff line
@@ -100,18 +100,3 @@ struct machine_desc * __init setup_machine_fdt(void *dt) 


	return mdesc_best;

}
 


/*

 * Copy the flattened DT out of .init since unflattening doesn't copy strings

 * and the normal DT APIs refs them from orig flat DT

 */

void __init copy_devtree(void)

{

	void *alloc = early_init_dt_alloc_memory_arch(

			be32_to_cpu(initial_boot_params->totalsize), 64);

	if (alloc) {

		memcpy(alloc, initial_boot_params,

				be32_to_cpu(initial_boot_params->totalsize));

		initial_boot_params = alloc;

	}

}

arch/arc/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -346,8 +346,7 @@ void __init setup_arch(char **cmdline_p) 
	setup_arch_memory();



	/* copy flat DT out of .init and then unflatten it */

	copy_devtree();

	unflatten_device_tree();

	unflatten_and_copy_device_tree();



	/* Can be issue if someone passes cmd line arg "ro"

	 * But that is unlikely so keeping it as it is