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/board-bonaire.c | |
| 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/board-bonaire.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-bonaire.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-bonaire.c b/arch/arm/mach-tegra/board-bonaire.c index 87bbc16152c8..2ae8986fd750 100644 --- a/arch/arm/mach-tegra/board-bonaire.c +++ b/arch/arm/mach-tegra/board-bonaire.c @@ -641,11 +641,9 @@ static void __init tegra_bonaire_reserve(void) #if defined(CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM) tegra_reserve(0, SZ_16M + SZ_2M, SZ_16M); #else -#if defined(CONFIG_TEGRA_SIMULATION_SPLIT_MEM) - if (tegra_split_mem_active()) + if (tegra_cpu_is_asim() && tegra_split_mem_active()) tegra_reserve(0, 0, 0); else -#endif tegra_reserve(SZ_128M, SZ_16M + SZ_2M, SZ_16M); #endif } |