diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 22:22:40 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 12:19:29 -0400 |
| commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
| tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-integrator/include | |
| parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) | |
ARM: set vga memory base at run-time
Convert the incorrectly named PCIMEM_BASE to a variable called vga_base.
This removes the dependency on mach/hardware.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator/include')
| -rw-r--r-- | arch/arm/mach-integrator/include/mach/hardware.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/include/mach/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h index 0ce52121dabe..65fed7c0eb84 100644 --- a/arch/arm/mach-integrator/include/mach/hardware.h +++ b/arch/arm/mach-integrator/include/mach/hardware.h | |||
| @@ -32,8 +32,6 @@ | |||
| 32 | #define IO_SIZE 0x0B000000 // How much? | 32 | #define IO_SIZE 0x0B000000 // How much? |
| 33 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO | 33 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO |
| 34 | 34 | ||
| 35 | #define PCIMEM_BASE PCI_MEMORY_VADDR | ||
| 36 | |||
| 37 | /* macro to get at IO space when running virtually */ | 35 | /* macro to get at IO space when running virtually */ |
| 38 | #ifdef CONFIG_MMU | 36 | #ifdef CONFIG_MMU |
| 39 | #define IO_ADDRESS(x) (((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE) | 37 | #define IO_ADDRESS(x) (((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE) |