diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-07 22:12:37 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-08 09:38:56 +0530 |
| commit | c0a8d45f8d753a86aeb9826d71a7a1d46ef31514 (patch) | |
| tree | 6fd31b985862435dd284ef70393d3b14c8636570 /arch | |
| parent | 23fd204acc136932ab2f5ff4ef353296c991e10c (diff) | |
| download | kernel_samsung_aries-c0a8d45f8d753a86aeb9826d71a7a1d46ef31514.zip kernel_samsung_aries-c0a8d45f8d753a86aeb9826d71a7a1d46ef31514.tar.gz kernel_samsung_aries-c0a8d45f8d753a86aeb9826d71a7a1d46ef31514.tar.bz2 | |
arm: p1: bring configs inline with aries
Change-Id: I714349baecec58c03b786c4b24f39a5113a824eb
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p1_defconfig | 11 | ||||
| -rw-r--r-- | arch/arm/configs/cyanogenmod_p1ln_defconfig | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/arch/arm/configs/cyanogenmod_p1_defconfig b/arch/arm/configs/cyanogenmod_p1_defconfig index 8629e8c..cc0230a 100644 --- a/arch/arm/configs/cyanogenmod_p1_defconfig +++ b/arch/arm/configs/cyanogenmod_p1_defconfig @@ -1,5 +1,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_KERNEL_LZMA=y +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -12,6 +13,8 @@ CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="source/usr/p1_initramfs.list" +CONFIG_INITRAMFS_COMPRESSION_NONE=y +# CONFIG_RD_GZIP is not set CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y CONFIG_ASHMEM=y @@ -53,8 +56,10 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_IDLE=y +CONFIG_DVFS_LIMIT=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=y @@ -106,7 +111,6 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y @@ -192,6 +196,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_MISC_DEVICES=y +# CONFIG_ANDROID_PMEM is not set CONFIG_UID_STAT=y CONFIG_APANIC=y CONFIG_USB_SWITCH_FSA9480=y @@ -250,6 +255,7 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y @@ -298,6 +304,9 @@ CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CMC623_PWM=y # CONFIG_BACKLIGHT_GENERIC is not set +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_DEBUG=y diff --git a/arch/arm/configs/cyanogenmod_p1ln_defconfig b/arch/arm/configs/cyanogenmod_p1ln_defconfig index d546f45..e17fbad 100644 --- a/arch/arm/configs/cyanogenmod_p1ln_defconfig +++ b/arch/arm/configs/cyanogenmod_p1ln_defconfig @@ -1,5 +1,6 @@ CONFIG_EXPERIMENTAL=y CONFIG_KERNEL_LZMA=y +CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -12,6 +13,8 @@ CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="source/usr/p1_initramfs.list" +CONFIG_INITRAMFS_COMPRESSION_NONE=y +# CONFIG_RD_GZIP is not set CONFIG_PANIC_TIMEOUT=5 CONFIG_KALLSYMS_ALL=y CONFIG_ASHMEM=y @@ -53,8 +56,10 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPU_IDLE=y +CONFIG_DVFS_LIMIT=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=y @@ -106,7 +111,6 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y -CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y @@ -192,6 +196,7 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_MISC_DEVICES=y +# CONFIG_ANDROID_PMEM is not set CONFIG_UID_STAT=y CONFIG_APANIC=y CONFIG_USB_SWITCH_FSA9480=y @@ -250,6 +255,7 @@ CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_SAMSUNG=y CONFIG_SERIAL_SAMSUNG_CONSOLE=y @@ -301,6 +307,9 @@ CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CMC623_PWM=y # CONFIG_BACKLIGHT_GENERIC is not set +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_DEBUG=y |