diff options
| author | Richard Liu <r66033@freescale.com> | 2013-06-09 10:10:16 +0800 |
|---|---|---|
| committer | Richard Liu <r66033@freescale.com> | 2013-06-09 10:13:50 +0800 |
| commit | eb515e2ba693bd186d362056a740aba4333eb068 (patch) | |
| tree | 855157430fe0690198125ed929b5876a4c4a8cb2 | |
| parent | eaa3930c8e752e8d75a0e1b50ec5cacee020293f (diff) | |
ENGR00266295 memblock_alloc_base() memory reserve fail for K Byte size
memblock_alloc_base() memory reserve fail for K Byte size,
with 512 DDR, reserve 128K memory then reserve 96M it will fail,
reserve 1M then reserve 96M (even reserve 256M also ok) it is ok.
Signed-off-by: Richard Liu <r66033@freescale.com>
| -rwxr-xr-x | arch/arm/mach-mx5/board-mx53_smd.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c index 8d341e57c17c..f205727cba3a 100755 --- a/arch/arm/mach-mx5/board-mx53_smd.c +++ b/arch/arm/mach-mx5/board-mx53_smd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -1465,10 +1465,10 @@ static void __init mx53_smd_reserve(void) int i; #ifdef CONFIG_ANDROID_RAM_CONSOLE - phys = memblock_alloc(SZ_128K, SZ_4K); - memblock_remove(phys, SZ_128K); + phys = memblock_alloc(SZ_1M, SZ_4K); + memblock_remove(phys, SZ_1M); ram_console_resource.start = phys; - ram_console_resource.end = phys + SZ_128K - 1; + ram_console_resource.end = phys + SZ_1M - 1; #endif if (imx53_gpu_data.gmem_reserved_size) { diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 338c16ab6a52..ec77b8646266 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -1371,11 +1371,11 @@ static void __init mx6q_sabrelite_reserve(void) int i; #ifdef CONFIG_ANDROID_RAM_CONSOLE - phys = memblock_alloc_base(SZ_128K, SZ_4K, SZ_1G); - memblock_remove(phys, SZ_128K); - memblock_free(phys, SZ_128K); + phys = memblock_alloc_base(SZ_1M, SZ_4K, SZ_1G); + memblock_remove(phys, SZ_1M); + memblock_free(phys, SZ_1M); ram_console_resource.start = phys; - ram_console_resource.end = phys + SZ_128K - 1; + ram_console_resource.end = phys + SZ_1M - 1; #endif #if defined(CONFIG_MXC_GPU_VIV) || defined(CONFIG_MXC_GPU_VIV_MODULE) diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 2a8705189fa6..810e672c566e 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -2169,11 +2169,11 @@ static void __init mx6q_sabresd_reserve(void) } #ifdef CONFIG_ANDROID_RAM_CONSOLE - phys = memblock_alloc_base(SZ_128K, SZ_4K, SZ_1G); - memblock_remove(phys, SZ_128K); - memblock_free(phys, SZ_128K); + phys = memblock_alloc_base(SZ_1M, SZ_4K, SZ_1G); + memblock_remove(phys, SZ_1M); + memblock_free(phys, SZ_1M); ram_console_resource.start = phys; - ram_console_resource.end = phys + SZ_128K - 1; + ram_console_resource.end = phys + SZ_1M - 1; #endif #if defined(CONFIG_MXC_GPU_VIV) || defined(CONFIG_MXC_GPU_VIV_MODULE) |