shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop

Browse Source
This commit is contained in:
lhh
2010-12-10 14:24:03 +08:00
parent 6033f1e646 b542fe7dcb
commit 5b3c73f1be
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-rk29/Kconfig
View File

@@ -6,6 +6,11 @@ config MACH_RK29SDK
help
Support for the ROCKCHIP Board For Rk29 Sdk.
config MACH_RK29SDK_MEM_SIZE_M
int "Memory size (in MiB)"
depends on MACH_RK29SDK
default 512
config WIFI_CONTROL_FUNC
bool "Enable WiFi control function abstraction"
help

6
arch/arm/mach-rk29/board-rk29sdk.c
View File

@@ -52,7 +52,11 @@
/* Set memory size of pmem */
#define SDRAM_SIZE SZ_512M
#ifdef CONFIG_MACH_RK29SDK_MEM_SIZE_M
#define SDRAM_SIZE (CONFIG_MACH_RK29SDK_MEM_SIZE_M * SZ_1M)
#else
#define SDRAM_SIZE SZ_512M
#endif
#define PMEM_GPU_SIZE SZ_48M
#define PMEM_UI_SIZE SZ_32M
#define PMEM_VPU_SIZE SZ_32M

2
arch/arm/mm/Kconfig
View File

@@ -774,5 +774,5 @@ config CACHE_XSC3L2
config ARM_L1_CACHE_SHIFT
int
default 6 if ARCH_OMAP3
default 6 if ARCH_OMAP3 || ARCH_RK29
default 5