aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMister Oyster <oysterized@gmail.com>2017-04-05 19:09:35 +0200
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:35:10 +0200
commit121445680a56892b40ab5477e093388bf4b1d9de (patch)
treebfc7e6a8dbe133ce387fef533b4e7025285a5c59
parentce0bbd5a095636418cd6a126f32900902bee8874 (diff)
defconfig: regen
-rw-r--r--arch/arm64/configs/los14_m2note_defconfig30
1 files changed, 17 insertions, 13 deletions
diff --git a/arch/arm64/configs/los14_m2note_defconfig b/arch/arm64/configs/los14_m2note_defconfig
index e8c9ab501..58e88d049 100644
--- a/arch/arm64/configs/los14_m2note_defconfig
+++ b/arch/arm64/configs/los14_m2note_defconfig
@@ -307,8 +307,6 @@ CONFIG_PHYS_ADDR_T_64BIT=y
CONFIG_ZONE_DMA_FLAG=1
# CONFIG_BOUNCE is not set
# CONFIG_KSM is not set
-# CONFIG_UKSM is not set
-# CONFIG_KSM_LEGACY is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_CLEANCACHE is not set
@@ -1241,8 +1239,6 @@ CONFIG_CUSTOM_LCM_Y="0"
# CONFIG_MTK_TVOUT_SUPPORT is not set
# CONFIG_MIXMODE_FOR_INCELL is not set
# CONFIG_LCM_SEND_CMD_IN_VIDEO is not set
-CONFIG_GPS=y
-CONFIG_MTK_GPS=y
# CONFIG_MTK_NFC is not set
CONFIG_MTK_BTIF=y
CONFIG_MTK_WAPI_SUPPORT=y
@@ -1250,7 +1246,6 @@ CONFIG_MTK_PASSPOINT_R1_SUPPORT=y
# CONFIG_MTK_PASSPOINT_R2_SUPPORT is not set
CONFIG_MTK_WIFI_MCC_SUPPORT=y
CONFIG_MTK_COMBO_WIFI=y
-CONFIG_MTK_COMBO_DISABLE_5G_FOR_P2P=y
CONFIG_MTK_BT_SUPPORT=y
CONFIG_MTK_WFD_SUPPORT=y
# CONFIG_MTK_MERGE_INTERFACE_SUPPORT is not set
@@ -1502,13 +1497,19 @@ CONFIG_MTK_COMBO=y
# CONFIG_MTK_COMBO_CHIP_CONSYS_6592 is not set
# CONFIG_MTK_COMBO_CHIP_CONSYS_8163 is not set
CONFIG_MTK_COMBO_CHIP_CONSYS_6735=y
+# CONFIG_MTK_COMBO_CHIP_CONSYS_6755 is not set
# CONFIG_MTK_COMBO_CHIP_CONSYS_6580 is not set
+# CONFIG_MTK_COMBO_CHIP_CONSYS_6797 is not set
CONFIG_MTK_COMBO_CHIP="CONSYS_6735"
CONFIG_MTK_COMBO_PLAT_PATH=""
# CONFIG_MTK_COMBO_COMM is not set
CONFIG_MTK_COMBO_BT=y
CONFIG_MTK_COMBO_GPS=y
+CONFIG_GPS=y
+CONFIG_MTK_GPS=y
CONFIG_MTK_GPS_SUPPORT=y
+# CONFIG_MTK_GPS_REGISTER_SETTING is not set
+CONFIG_MTK_COMBO_DISABLE_5G_FOR_P2P=y
#
# Meizu hall driver
@@ -2828,11 +2829,6 @@ CONFIG_EXT4_USE_FOR_EXT23=y
# CONFIG_EXT4_FS_POSIX_ACL is not set
CONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not set
-# CONFIG_F2FS_CHECK_FS is not set
-CONFIG_F2FS_FS=y
-# CONFIG_F2FS_FS_SECURITY is not set
-CONFIG_F2FS_FS_XATTR=y
-CONFIG_F2FS_STAT_FS=y
CONFIG_JBD2=y
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
@@ -2843,8 +2839,9 @@ CONFIG_FS_MBCACHE=y
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
@@ -2924,7 +2921,14 @@ CONFIG_SDCARD_FS=y
# CONFIG_PSTORE is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
-# CONFIG_F2FS_FS is not set
+CONFIG_F2FS_FS=y
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_FS_ENCRYPTION is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
@@ -3206,7 +3210,7 @@ CONFIG_CRYPTO_HMAC=y
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-# CONFIG_CRYPTO_CRC32 is not set
+CONFIG_CRYPTO_CRC32=y
# CONFIG_CRYPTO_GHASH is not set
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_MD5=y