From c229917263746ba765e7b4f3b9b0e8ebf872f7f3 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2011 18:01:12 +0800 Subject: [PATCH] A22:update rk29_a22_defconfig from phonesdk Conflicts: arch/arm/configs/rk29_a22_defconfig --- arch/arm/configs/rk29_a22_defconfig | 106 ++++++++++++++++------------ 1 file changed, 59 insertions(+), 47 deletions(-) mode change 100755 => 100644 arch/arm/configs/rk29_a22_defconfig diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig old mode 100755 new mode 100644 index 4e8016e58c4d..29cb79c8b9c6 --- a/arch/arm/configs/rk29_a22_defconfig +++ b/arch/arm/configs/rk29_a22_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.27 -# Wed Jul 13 20:55:31 2011 +# Thu Aug 25 15:26:43 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -35,6 +35,12 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZO=y +# CONFIG_KERNEL_GZIP is not set +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set +CONFIG_KERNEL_LZO=y # CONFIG_SWAP is not set # CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set @@ -52,7 +58,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set # CONFIG_IKCONFIG is not set -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_BUF_SHIFT=19 CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y # CONFIG_CGROUP_NS is not set @@ -193,9 +199,7 @@ CONFIG_MMU=y # CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set # CONFIG_ARCH_BCMRING is not set -# CONFIG_ARCH_RK2818 is not set CONFIG_ARCH_RK29=y -CONFIG_WIFI_CONTROL_FUNC=y # CONFIG_MACH_RK29SDK is not set # CONFIG_MACH_RK29SDK_DDR3 is not set # CONFIG_MACH_RK29WINACCORD is not set @@ -229,14 +233,17 @@ CONFIG_DDR_TYPE_LPDDR=y # CONFIG_DDR_TYPE_DDR3_2133M is not set # CONFIG_DDR_TYPE_DDR3_2133N is not set # CONFIG_DDR_TYPE_DDR3_DEFAULT is not set +CONFIG_RK29_MEM_SIZE_512M=y +# CONFIG_RK29_MEM_SIZE_1G is not set CONFIG_RK29_MEM_SIZE_M=512 CONFIG_DDR_SDRAM_FREQ=192 +# CONFIG_DDR_RECONFIG is not set +CONFIG_WIFI_CONTROL_FUNC=y # # RK29 VPU (Video Processing Unit) support # CONFIG_RK29_VPU=y -CONFIG_RK29_VPU_SERVICE=y # CONFIG_RK29_VPU_DEBUG is not set # CONFIG_RK29_JTAG is not set CONFIG_RK29_LAST_LOG=y @@ -248,6 +255,7 @@ CONFIG_RK29_WORKING_POWER_MANAGEMENT=y CONFIG_RK29_CLK_SWITCH_TO_32K=y CONFIG_RK29_GPIO_SUSPEND=y CONFIG_RK29_SPI_INSRAM=y +# CONFIG_RK29_CHARGE_EARLYSUSPEND is not set # # Processor Type @@ -441,7 +449,27 @@ CONFIG_INET_TCP_DIAG=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -# CONFIG_IPV6 is not set +CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +# CONFIG_IPV6_ROUTE_INFO is not set +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=y +CONFIG_INET6_ESP=y +CONFIG_INET6_IPCOMP=y +CONFIG_IPV6_MIP6=y +CONFIG_INET6_XFRM_TUNNEL=y +CONFIG_INET6_TUNNEL=y +CONFIG_INET6_XFRM_MODE_TRANSPORT=y +CONFIG_INET6_XFRM_MODE_TUNNEL=y +CONFIG_INET6_XFRM_MODE_BEET=y +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=y +CONFIG_IPV6_MULTIPLE_TABLES=y +# CONFIG_IPV6_SUBTREES is not set +# CONFIG_IPV6_MROUTE is not set CONFIG_ANDROID_PARANOID_NETWORK=y # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set @@ -634,7 +662,7 @@ CONFIG_ANDROID_PMEM=y # CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_KERNEL_DEBUGGER_CORE is not set # CONFIG_ISL29003 is not set -# CONFIG_UID_STAT is not set +CONFIG_UID_STAT=y # CONFIG_WL127X_RFKILL is not set CONFIG_APANIC=y CONFIG_APANIC_PLABEL="kpanic" @@ -653,6 +681,7 @@ CONFIG_MTK23D=y # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set # CONFIG_EEPROM_93CX6 is not set +# CONFIG_RK29_SUPPORT_MODEM is not set CONFIG_RK29_GPS=y CONFIG_GPS_GNS7560=y @@ -660,8 +689,9 @@ CONFIG_GPS_GNS7560=y # Motion Sensors Support # # CONFIG_MPU_NONE is not set -# CONFIG_SENSORS_MPU3050 is not set -# CONFIG_SENSORS_MPU6000 is not set +# CONFIG_MPU_SENSORS_MPU3050 is not set +# CONFIG_MPU_SENSORS_MPU6000 is not set +# CONFIG_MPU_SENSORS_TIMERIRQ is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -869,10 +899,12 @@ CONFIG_TOUCHSCREEN_ILI2102_IIC=y # CONFIG_SINTEK_3FA16 is not set # CONFIG_EETI_EGALAX is not set # CONFIG_TOUCHSCREEN_IT7260 is not set +# CONFIG_TOUCHSCREEN_NAS is not set +# CONFIG_LAIBAO_TS is not set # CONFIG_TOUCHSCREEN_GT801_IIC is not set # CONFIG_TOUCHSCREEN_GT818_IIC is not set # CONFIG_D70_L3188A is not set -# CONFIG_TOUCHSCREEN_GOODIX_NEWTON is not set +# CONFIG_TOUCHSCREEN_GT819 is not set # CONFIG_TOUCHSCREEN_FT5406 is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_LPSENSOR_ISL29028 is not set @@ -1011,7 +1043,6 @@ CONFIG_SPIM1_RK29=y CONFIG_ADC=y # CONFIG_ADC_RK28 is not set CONFIG_ADC_RK29=y -# CONFIG_SPI_FPGA is not set # # Headset device support @@ -1074,6 +1105,7 @@ CONFIG_WM831X_WITH_BATTERY=y # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_STC3100 is not set # CONFIG_BATTERY_BQ27510 is not set +# CONFIG_BATTERY_BQ27541 is not set # CONFIG_BATTERY_BQ3060 is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set @@ -1101,7 +1133,6 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set # CONFIG_PMIC_DA903X is not set -# CONFIG_MFD_WM8994 is not set # CONFIG_MFD_WM8400 is not set CONFIG_MFD_WM831X=y # CONFIG_MFD_WM831X_I2C is not set @@ -1189,6 +1220,7 @@ CONFIG_SOC_CAMERA_MT9T111=y # CONFIG_SOC_CAMERA_OV5640 is not set # CONFIG_SOC_CAMERA_S5K6AA is not set # CONFIG_SOC_CAMERA_GT2005 is not set +# CONFIG_SOC_CAMERA_GC0307 is not set # CONFIG_SOC_CAMERA_GC0308 is not set CONFIG_SOC_CAMERA_GC0309=y # CONFIG_SOC_CAMERA_GC2015 is not set @@ -1276,6 +1308,7 @@ CONFIG_DISPLAY_SUPPORT=y # CONFIG_LCD_RGB_TFT480800_25_E is not set # CONFIG_LCD_HSD100PXN is not set # CONFIG_LCD_HSD07PFW1 is not set +# CONFIG_LCD_BYD8688FTGF is not set # CONFIG_LCD_B101AW06 is not set # CONFIG_LCD_LS035Y8DX02A is not set # CONFIG_LCD_CPTCLAA038LA31XE is not set @@ -1421,27 +1454,28 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y -# CONFIG_MMC_PARANOID_SD_INIT is not set +CONFIG_MMC_PARANOID_SD_INIT=y # # MMC/SD/SDIO Card Drivers # CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_MMC_BLOCK_DEFERRED_RESUME=y +# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set # CONFIG_SDIO_UART is not set # CONFIG_MMC_TEST is not set # # MMC/SD/SDIO Host Controller Drivers # +CONFIG_SDMMC_RK29_OLD=y CONFIG_SDMMC_RK29=y # # Now, there are two SDMMC controllers selected, SDMMC0 and SDMMC1. # +# CONFIG_SDMMC_RK29_OLD is not set CONFIG_SDMMC0_RK29=y -# CONFIG_EMMC_RK29 is not set CONFIG_SDMMC1_RK29=y # CONFIG_MMC_SDHCI is not set # CONFIG_MMC_AT91 is not set @@ -1456,6 +1490,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO_PLATFORM=y +# CONFIG_LEDS_NEWTON_PWM is not set # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_PCA955X is not set CONFIG_LEDS_WM831X_STATUS=y @@ -1577,21 +1612,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y # CONFIG_RAR_REGISTER is not set # CONFIG_IIO is not set -# -# DSP -# -# CONFIG_RK2818_DSP is not set - -# -# RK1000 control -# -# CONFIG_RK1000_CONTROL is not set - -# -# rk2818 POWER CONTROL -# -# CONFIG_RK2818_POWER is not set - # # GPU Vivante # @@ -1601,6 +1621,7 @@ CONFIG_VIVANTE=y # IPP # CONFIG_RK29_IPP=y +# CONFIG_DEINTERLACE is not set # # CMMB @@ -1620,12 +1641,12 @@ CONFIG_RK29_IPP=y # CONFIG_EXT2_FS is not set CONFIG_EXT3_FS=y CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set -# CONFIG_EXT4_FS is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +# CONFIG_EXT4_FS_XATTR is not set +# CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y -CONFIG_FS_MBCACHE=y +CONFIG_JBD2=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1641,7 +1662,8 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=y +# CONFIG_CUSE is not set # # Caches @@ -1683,17 +1705,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_YAFFS_FS=y -CONFIG_YAFFS_YAFFS1=y -# CONFIG_YAFFS_9BYTE_TAGS is not set -# CONFIG_YAFFS_DOES_ECC is not set -CONFIG_YAFFS_YAFFS2=y -CONFIG_YAFFS_AUTO_YAFFS2=y -# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set -# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set -# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set -CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y -# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set +# CONFIG_YAFFS_FS is not set # CONFIG_JFFS2_FS is not set CONFIG_CRAMFS=y # CONFIG_SQUASHFS is not set -- 2.34.1