Commit a811c05c authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

nios2: use generic early_init_dt_add_memory_arch 

All we have to do is to enable memblock, the generic FDT code will take
care of the rest.

Link: http://lkml.kernel.org/r/1533326330-31677-4-git-send-email-rppt@linux.vnet.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: default avatarLey Foon Tan <ley.foon.tan@intel.com>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rob Herring <robh@kernel.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6072cf56

arch/nios2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config NIOS2 
	select SPARSE_IRQ

	select USB_ARCH_HAS_HCD if USB_SUPPORT

	select CPU_NO_EFFICIENT_FFS

	select HAVE_MEMBLOCK



config GENERIC_CSUM

	def_bool y

arch/nios2/kernel/prom.c

+0 −10
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ 


#include <asm/sections.h>



void __init early_init_dt_add_memory_arch(u64 base, u64 size)

{

	u64 kernel_start = (u64)virt_to_phys(_text);



	if (!memory_size &&

	    (kernel_start >= base) && (kernel_start < (base + size)))

		memory_size = size;



}



int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,

					     bool nomap)

{

arch/nios2/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/sched/task.h>

#include <linux/console.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/initrd.h>

#include <linux/of_fdt.h>

#include <linux/screen_info.h>
@@ -147,6 +148,7 @@ void __init setup_arch(char **cmdline_p) 


	console_verbose();



	memory_size = memblock_phys_mem_size();

	memory_start = PAGE_ALIGN((unsigned long)__pa(_end));

	memory_end = (unsigned long) CONFIG_NIOS2_MEM_BASE + memory_size;

CRA Git | Maintained and supported by SUSTech CRA and CCSE