diff options
| author | Chetan Kumar N G <chetankumarn@nvidia.com> | 2013-06-20 10:32:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:40:48 -0700 |
| commit | 28f70d6aac0c3a14f7c041183660fa203557552f (patch) | |
| tree | fe9b9ca6f4b2d3dd57f6a25e3172134a0a67aa0f /arch/arm/mach-tegra/iomap.h | |
| parent | 42ba399120bbedb70c0fb57c598ab18f623c6feb (diff) | |
ARM: tegra: enable split mem config at runtime
This change is a part of the effort to enable runtime
platform detection and reduce compile-time conditionals.
Bug 1333554
Change-Id: I5dac33e6a3c8d2609fb57580658f05a2612e46df
Signed-off-by: Chetan Kumar N G <chetankumarn@nvidia.com>
Reviewed-on: http://git-master/r/252560
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/iomap.h')
| -rw-r--r-- | arch/arm/mach-tegra/iomap.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/iomap.h b/arch/arm/mach-tegra/iomap.h index 74e80a58c801..a4ab354f492b 100644 --- a/arch/arm/mach-tegra/iomap.h +++ b/arch/arm/mach-tegra/iomap.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2010 Google, Inc. - * Copyright (C) 2011-2013, NVIDIA Corporation. + * Copyright (C) 2011-2013, NVIDIA Corporation. All rights reserved. * * Author: * Colin Cross <ccross@google.com> @@ -749,7 +749,6 @@ defined(CONFIG_ARCH_TEGRA_12x_SOC)) #define TEGRA_SIM_ETH_SIZE SZ_64K #endif -#ifdef CONFIG_TEGRA_SIMULATION_SPLIT_MEM #define TEGRA_ASIM_QT_FRONT_DOOR_MEM_START 0x81000000 #define TEGRA_ASIM_QT_FRONT_DOOR_MEM_SIZE (SZ_256M - SZ_16M) #define TEGRA_ASIM_QT_FB_START TEGRA_ASIM_QT_FRONT_DOOR_MEM_START @@ -759,7 +758,6 @@ defined(CONFIG_ARCH_TEGRA_12x_SOC)) #define TEGRA_ASIM_QT_CARVEOUT_VPR_DISABLED_SIZE \ (TEGRA_ASIM_QT_FRONT_DOOR_MEM_SIZE - TEGRA_ASIM_QT_FB_SIZE) #define TEGRA_ASIM_QT_CARVEOUT_MIN_SIZE SZ_128M -#endif #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) || \ defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_14x_SOC) |