Commit 0e79671e authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-bcmring: remove mach/memory.h 



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

arch/arm/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -324,6 +324,7 @@ config ARCH_BCMRING 
	select CLKDEV_LOOKUP

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select NO_MACH_MEMORY_H

	help

	help

	  Support for Broadcom's BCMRing platform.

	  Support for Broadcom's BCMRing platform.

arch/arm/mach-bcmring/include/mach/hardware.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#define __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H





#include <asm/sizes.h>

#include <asm/sizes.h>

#include <mach/memory.h>

#include <cfg_global.h>

#include <cfg_global.h>

#include <mach/csp/mm_io.h>

#include <mach/csp/mm_io.h>
@@ -31,7 +30,7 @@ 
 *  *_SIZE  is the size of the region

 *  *_SIZE  is the size of the region

 *  *_BASE  is the virtual address

 *  *_BASE  is the virtual address

 */

 */

#define RAM_START               PLAT_PHYS_OFFSET

#define RAM_START               PHYS_OFFSET





#define RAM_SIZE                (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)

#define RAM_SIZE                (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED)

#define RAM_BASE                PAGE_OFFSET

#define RAM_BASE                PAGE_OFFSET

arch/arm/mach-bcmring/include/mach/memory.h

deleted100644 → 0
+0 −28
Original line number Original line Diff line number Diff line 
/*****************************************************************************

* Copyright 2005 - 2008 Broadcom Corporation.  All rights reserved.

*

* Unless you and Broadcom execute a separate written software license

* agreement governing use of this software, this software is licensed to you

* under the terms of the GNU General Public License version 2, available at

* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").

*

* Notwithstanding the above, under no circumstances may you combine this

* software in any way with any other Broadcom software provided under a

* license other than the GPL, without Broadcom's express prior written

* consent.

*****************************************************************************/



#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



#include <cfg_global.h>



/*

 * Physical vs virtual RAM address space conversion.  These are

 * private definitions which should NOT be used outside memory.h

 * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.

 */



#define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE



#endif