Commit 08854f41 authored by Rob Herring's avatar Rob Herring
Browse files

metag: 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>
Cc: James Hogan <james.hogan@imgtec.com>
parent 3104021c

arch/metag/kernel/devtree.c

+0 −16
Original line number Diff line number Diff line
@@ -94,21 +94,5 @@ struct machine_desc * __init setup_machine_fdt(void *dt) 
	of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);



	return mdesc_best;

}



/**

 * copy_fdt - Copy device tree into non-init memory.

 *

 * We must copy the flattened device tree blob into non-init memory because the

 * unflattened device tree will reference the strings in it directly.

 */

void __init copy_fdt(void)

{

	void *alloc = early_init_dt_alloc_memory_arch(

			be32_to_cpu(initial_boot_params->totalsize), 0x40);

	if (alloc) {

		memcpy(alloc, initial_boot_params,

		       be32_to_cpu(initial_boot_params->totalsize));

		initial_boot_params = alloc;

	}

}

arch/metag/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -408,9 +408,7 @@ void __init setup_arch(char **cmdline_p) 
	cpu_2_hwthread_id[smp_processor_id()] = hard_processor_id();

	hwthread_id_2_cpu[hard_processor_id()] = smp_processor_id();



	/* Copy device tree blob into non-init memory before unflattening */

	copy_fdt();

	unflatten_device_tree();

	unflatten_and_copy_device_tree();



#ifdef CONFIG_SMP

	smp_init_cpus();