diff options
| author | Huang Shijie <b32955@freescale.com> | 2012-05-16 18:39:14 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:37:40 +0800 |
| commit | 61d5f2c422f5b282342b7d0e73fdc91b490484c3 (patch) | |
| tree | 836d89aefcc66294f62476ccbc7acbbc34996784 | |
| parent | 7c47640e62b8f88808af8c47e50e9d88d090a66d (diff) | |
ENGR00209557 IMX6: GPU: do not reserve memory when GPU is not enabled
The current code will reserve 128M for GPU even when it is not enabled.
It is not needed. So do not reserve the memory when the GPU is not enabled.
(this can save 128M for Mfgtool.)
Signed-off-by: Huang Shijie <b32955@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_arm2.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c index 967212abd1b6..43a0b373a879 100644 --- a/arch/arm/mach-mx6/board-mx6q_arm2.c +++ b/arch/arm/mach-mx6/board-mx6q_arm2.c @@ -2204,6 +2204,7 @@ static struct sys_timer mxc_timer = { static void __init mx6_arm2_reserve(void) { +#ifdef CONFIG_MXC_GPU_VIV phys_addr_t phys; if (imx6_gpu_pdata.reserved_mem_size) { @@ -2213,6 +2214,7 @@ static void __init mx6_arm2_reserve(void) memblock_remove(phys, imx6_gpu_pdata.reserved_mem_size); imx6_gpu_pdata.reserved_mem_base = phys; } +#endif } MACHINE_START(MX6Q_ARM2, "Freescale i.MX 6Quad/Solo/DualLite Armadillo2 Board") diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 99a7c868c490..d7ea2df729c9 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -1535,6 +1535,7 @@ static struct sys_timer mxc_timer = { static void __init mx6q_reserve(void) { +#ifdef CONFIG_MXC_GPU_VIV phys_addr_t phys; if (imx6q_gpu_pdata.reserved_mem_size) { @@ -1544,6 +1545,7 @@ static void __init mx6q_reserve(void) memblock_remove(phys, imx6q_gpu_pdata.reserved_mem_size); imx6q_gpu_pdata.reserved_mem_base = phys; } +#endif } MACHINE_START(MX6Q_SABREAUTO, "Freescale i.MX 6Quad/DualLite/Solo Sabre Auto Board") diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index 95145f4c7a55..ce7305ad440b 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -1185,6 +1185,7 @@ static struct sys_timer mx6_sabrelite_timer = { static void __init mx6q_sabrelite_reserve(void) { +#ifdef CONFIG_MXC_GPU_VIV phys_addr_t phys; if (imx6q_gpu_pdata.reserved_mem_size) { @@ -1194,6 +1195,7 @@ static void __init mx6q_sabrelite_reserve(void) memblock_remove(phys, imx6q_gpu_pdata.reserved_mem_size); imx6q_gpu_pdata.reserved_mem_base = phys; } +#endif } /* diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index a52cc4247cbb..66c9df9bde68 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -1807,6 +1807,7 @@ static struct sys_timer mx6_sabresd_timer = { static void __init mx6q_sabresd_reserve(void) { +#ifdef CONFIG_MXC_GPU_VIV phys_addr_t phys; if (imx6q_gpu_pdata.reserved_mem_size) { @@ -1816,6 +1817,7 @@ static void __init mx6q_sabresd_reserve(void) memblock_remove(phys, imx6q_gpu_pdata.reserved_mem_size); imx6q_gpu_pdata.reserved_mem_base = phys; } +#endif } /* |