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

Commit 1b9f95f8 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: prepare for removal of a bunch of <mach/memory.h> files 



When the CONFIG_NO_MACH_MEMORY_H symbol is selected by a particular
machine class, the machine specific memory.h include file is no longer
used and can be removed.  In that case the equivalent information can
be obtained dynamically at runtime by enabling CONFIG_ARM_PATCH_PHYS_VIRT
or by specifying the physical memory address at kernel configuration time.

If/when all instances of mach/memory.h are removed then this symbol could
be removed.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 67f462b2

arch/arm/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -211,6 +211,17 @@ config ARM_PATCH_PHYS_VIRT 
	  this feature (eg, building a kernel for a single machine) and

	  you need to shrink the kernel to the minimal size.



config NO_MACH_MEMORY_H

	bool

	help

	  Select this when mach/memory.h is removed.



config PHYS_OFFSET

	hex "Physical address of main memory"

	depends on !ARM_PATCH_PHYS_VIRT && NO_MACH_MEMORY_H

	help

	  Please provide the physical address corresponding to the

	  location of main memory in your system.



source "init/Kconfig"

arch/arm/include/asm/memory.h

+8 −1
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 
#include <linux/compiler.h>

#include <linux/const.h>

#include <linux/types.h>

#include <mach/memory.h>

#include <asm/sizes.h>



#ifndef CONFIG_NO_MACH_MEMORY_H

#include <mach/memory.h>

#endif



/*

 * Allow for constants defined here to be used from assembly code

 * by prepending the UL suffix only with actual C code compilation.
@@ -184,7 +187,11 @@ static inline unsigned long __phys_to_virt(unsigned long x) 
#endif



#ifndef PHYS_OFFSET

#ifdef PLAT_PHYS_OFFSET

#define PHYS_OFFSET	PLAT_PHYS_OFFSET

#else

#define PHYS_OFFSET	UL(CONFIG_PHYS_OFFSET)

#endif

#endif



/*

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ ENTRY(stext) 
	sub	r4, r3, r4			@ (PHYS_OFFSET - PAGE_OFFSET)

	add	r8, r8, r4			@ PHYS_OFFSET

#else

	ldr	r8, =PLAT_PHYS_OFFSET

	ldr	r8, =PHYS_OFFSET		@ always constant in this case

#endif



	/*