The platforms selecting NEED_MACH_MEMORY_H defined the start address of their physical memory in the respective <mach/memory.h>. With ARM_PATCH_PHYS_VIRT=y (which is quite common today) this is useless though because the definition isn't used but determined dynamically. So remove the definitions from all <mach/memory.h> and provide the Kconfig symbol PHYS_OFFSET with the respective defaults in case ARM_PATCH_PHYS_VIRT isn't enabled. This allows to drop the dependency of PHYS_OFFSET on !NEED_MACH_MEMORY_H which prevents compiling an integrator nommu-kernel. (CONFIG_PAGE_OFFSET which has "default PHYS_OFFSET if !MMU" expanded to "0x" because CONFIG_PHYS_OFFSET doesn't exist as INTEGRATOR selects NEED_MACH_MEMORY_H.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
		
			
				
	
	
		
			35 lines
		
	
	
	
		
			991 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
	
		
			991 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  arch/arm/mach-rpc/include/mach/memory.h
 | 
						|
 *
 | 
						|
 *  Copyright (C) 1996,1997,1998 Russell King.
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 *  Changelog:
 | 
						|
 *   20-Oct-1996 RMK	Created
 | 
						|
 *   31-Dec-1997 RMK	Fixed definitions to reduce warnings
 | 
						|
 *   11-Jan-1998 RMK	Uninlined to reduce hits on cache
 | 
						|
 *   08-Feb-1998 RMK	Added __virt_to_bus and __bus_to_virt
 | 
						|
 *   21-Mar-1999 RMK	Renamed to memory.h
 | 
						|
 *		 RMK	Added TASK_SIZE and PAGE_OFFSET
 | 
						|
 */
 | 
						|
#ifndef __ASM_ARCH_MEMORY_H
 | 
						|
#define __ASM_ARCH_MEMORY_H
 | 
						|
 | 
						|
/*
 | 
						|
 * Cache flushing area - ROM
 | 
						|
 */
 | 
						|
#define FLUSH_BASE_PHYS		0x00000000
 | 
						|
#define FLUSH_BASE		0xdf000000
 | 
						|
 | 
						|
/*
 | 
						|
 * Sparsemem support.  Each section is a maximum of 64MB.  The sections
 | 
						|
 * are offset by 128MB and can cover 128MB, so that gives us a maximum
 | 
						|
 * of 29 physmem bits.
 | 
						|
 */
 | 
						|
#define MAX_PHYSMEM_BITS	29
 | 
						|
#define SECTION_SIZE_BITS	26
 | 
						|
 | 
						|
#endif
 |