From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 2 Jun 2015 10:23:41 +0000 (+0800)
Subject: arm64: rockchip: rockchip_defconfig sync with samsung product
X-Git-Tag: firefly_0821_release~4086
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d2ba06a564811c77e5470d6d076ba4cadda132c;p=firefly-linux-kernel-4.4.55.git

arm64: rockchip: rockchip_defconfig sync with samsung product

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index bc2d8a4e1fc2..fa3a0c629a38 100644
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -29,8 +29,10 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_CMDLINE_PARTITION=y
+# CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_BLOCK_RKNAND=y
+CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE=y
@@ -42,17 +44,15 @@ CONFIG_HMP_FREQUENCY_INVARIANT_SCALE=y
 CONFIG_SCHED_HMP_LITTLE_PACKING=y
 CONFIG_PREEMPT=y
 CONFIG_ARMV7_COMPAT=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_CMA=y
+CONFIG_ZSMALLOC=y
 CONFIG_SECCOMP=y
+# CONFIG_EFI is not set
 # CONFIG_COREDUMP is not set
 CONFIG_COMPAT=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=0
-# CONFIG_PM_WAKELOCKS_GC is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_DEBUG=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
@@ -206,6 +206,8 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DMA_CMA=y
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -544,8 +546,6 @@ CONFIG_RTC_DRV_RC5T619=y
 CONFIG_DMADEVICES=y
 CONFIG_PL330_DMA=y
 CONFIG_STAGING=y
-CONFIG_ZSMALLOC=y
-CONFIG_ZRAM=y
 CONFIG_ANDROID=y
 CONFIG_ASHMEM=y
 CONFIG_ANDROID_LOGGER=y
@@ -560,10 +560,6 @@ CONFIG_ION_ROCKCHIP=y
 CONFIG_ION_CMA_HIGHMEM=y
 CONFIG_ION_ROCKCHIP_SNAPSHOT=y
 CONFIG_ION_SNAPSHOT_BUF_SHIFT=15
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_MAILBOX=y
 CONFIG_ROCKCHIP_MAILBOX=y
@@ -577,7 +573,6 @@ CONFIG_ROCKCHIP_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RESET_CONTROLLER=y
-CONFIG_GENERIC_PHY=y
 CONFIG_PHY_ROCKCHIP_USB=y
 CONFIG_RK_HEADSET=y
 CONFIG_ANDROID_BINDER_IPC=y
@@ -607,15 +602,10 @@ CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
 CONFIG_PRINTK_TIME=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_DEBUG_INFO=y
-CONFIG_SCHED_TRACER=y
-CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_EARLY_PRINTK is not set
 CONFIG_KEYS=y
 CONFIG_SECURITY=y
@@ -623,5 +613,7 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_SECURITY_SELINUX=y
 CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_ARM64_CRYPTO=y