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

Commit 1f8a9ef1 authored by Jayachandran C's avatar Jayachandran C Committed by John Crispin
Browse files

MIPS: Netlogic: merge of.c into setup.c 



Move the function device_tree_init() from netlogic/xlp/of.c
to setup.c, and remove the wrapper functions reserve_mem_mach()
and free_mem_mach().

Remove file netlogic/xlp/of.c, and the Makefile entry for it.

Signed-off-by: default avatarJayachandran C <jayachandranc@netlogicmicro.com>
Patchwork: http://patchwork.linux-mips.org/patch/4097/


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 98dbc576

arch/mips/netlogic/xlp/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y				+= setup.o platform.o nlm_hal.o

obj-$(CONFIG_OF)		+= of.o

obj-$(CONFIG_SMP)		+= wakeup.o

obj-$(CONFIG_USB)		+= usb-init.o

arch/mips/netlogic/xlp/of.c

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
#include <linux/bootmem.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/of_fdt.h>

#include <asm/byteorder.h>



static int __init reserve_mem_mach(unsigned long addr, unsigned long size)

{

	return reserve_bootmem(addr, size, BOOTMEM_DEFAULT);

}



void __init free_mem_mach(unsigned long addr, unsigned long size)

{

	return free_bootmem(addr, size);

}



void __init device_tree_init(void)

{

	unsigned long base, size;



	if (!initial_boot_params)

		return;



	base = virt_to_phys((void *)initial_boot_params);

	size = be32_to_cpu(initial_boot_params->totalsize);



	/* Before we do anything, lets reserve the dt blob */

	reserve_mem_mach(base, size);



	unflatten_device_tree();



	/* free the space reserved for the dt blob */

	free_mem_mach(base, size);

}

arch/mips/netlogic/xlp/setup.c

+20 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/kernel.h>

#include <linux/serial_8250.h>

#include <linux/pm.h>

#include <linux/bootmem.h>



#include <asm/reboot.h>

#include <asm/time.h>
@@ -112,6 +113,25 @@ void __init prom_init(void) 
#endif

}



void __init device_tree_init(void)

{

	unsigned long base, size;



	if (!initial_boot_params)

		return;



	base = virt_to_phys((void *)initial_boot_params);

	size = be32_to_cpu(initial_boot_params->totalsize);



	/* Before we do anything, lets reserve the dt blob */

	reserve_bootmem(base, size, BOOTMEM_DEFAULT);



	unflatten_device_tree();



	/* free the space reserved for the dt blob */

	free_bootmem(base, size);

}



static struct of_device_id __initdata xlp_ids[] = {

	{ .compatible = "simple-bus", },

	{},