diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-02 21:45:26 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:50 -0400 |
| commit | c039bad00f21a025df6fcb238578023c2cc881bf (patch) | |
| tree | fb15db24c1548164f71c5919a57b9570c243ebc7 /arch | |
| parent | 17dea45adbd2c2df726699b25e2ddf8916d5eb87 (diff) | |
ARM: plat-mxc: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 43 |
2 files changed, 1 insertions, 43 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b30cf6437c99..408d413826cb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -410,6 +410,7 @@ config ARCH_MXC | |||
| 410 | select CLKSRC_MMIO | 410 | select CLKSRC_MMIO |
| 411 | select GENERIC_IRQ_CHIP | 411 | select GENERIC_IRQ_CHIP |
| 412 | select HAVE_SCHED_CLOCK | 412 | select HAVE_SCHED_CLOCK |
| 413 | select NO_MACH_MEMORY_H | ||
| 413 | help | 414 | help |
| 414 | Support for Freescale MXC/iMX-based family of processors | 415 | Support for Freescale MXC/iMX-based family of processors |
| 415 | 416 | ||
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h deleted file mode 100644 index 3ec84b902243..000000000000 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. | ||
| 3 | */ | ||
| 4 | |||
| 5 | /* | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_MXC_MEMORY_H__ | ||
| 12 | #define __ASM_ARCH_MXC_MEMORY_H__ | ||
| 13 | |||
| 14 | #define MX1_PHYS_OFFSET UL(0x08000000) | ||
| 15 | #define MX21_PHYS_OFFSET UL(0xc0000000) | ||
| 16 | #define MX25_PHYS_OFFSET UL(0x80000000) | ||
| 17 | #define MX27_PHYS_OFFSET UL(0xa0000000) | ||
| 18 | #define MX3x_PHYS_OFFSET UL(0x80000000) | ||
| 19 | #define MX50_PHYS_OFFSET UL(0x70000000) | ||
| 20 | #define MX51_PHYS_OFFSET UL(0x90000000) | ||
| 21 | #define MX53_PHYS_OFFSET UL(0x70000000) | ||
| 22 | |||
| 23 | #if !defined(CONFIG_RUNTIME_PHYS_OFFSET) | ||
| 24 | # if defined CONFIG_ARCH_MX1 | ||
| 25 | # define PLAT_PHYS_OFFSET MX1_PHYS_OFFSET | ||
| 26 | # elif defined CONFIG_MACH_MX21 | ||
| 27 | # define PLAT_PHYS_OFFSET MX21_PHYS_OFFSET | ||
| 28 | # elif defined CONFIG_ARCH_MX25 | ||
| 29 | # define PLAT_PHYS_OFFSET MX25_PHYS_OFFSET | ||
| 30 | # elif defined CONFIG_MACH_MX27 | ||
| 31 | # define PLAT_PHYS_OFFSET MX27_PHYS_OFFSET | ||
| 32 | # elif defined CONFIG_ARCH_MX3 | ||
| 33 | # define PLAT_PHYS_OFFSET MX3x_PHYS_OFFSET | ||
| 34 | # elif defined CONFIG_ARCH_MX50 | ||
| 35 | # define PLAT_PHYS_OFFSET MX50_PHYS_OFFSET | ||
| 36 | # elif defined CONFIG_ARCH_MX51 | ||
| 37 | # define PLAT_PHYS_OFFSET MX51_PHYS_OFFSET | ||
| 38 | # elif defined CONFIG_ARCH_MX53 | ||
| 39 | # define PLAT_PHYS_OFFSET MX53_PHYS_OFFSET | ||
| 40 | # endif | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ | ||