From 9280e9ebd76fbaaf7186f19dec58cb4c7b6f7bf2 Mon Sep 17 00:00:00 2001 From: Michael Benedict Date: Tue, 27 Aug 2019 01:37:03 +1000 Subject: [PATCH] defconfig: sync Signed-off-by: Michael Benedict --- arch/arm64/configs/exynos8895-dream2lte_defconfig | 9 ++++++--- arch/arm64/configs/exynos8895-dreamlte_defconfig | 9 ++++++--- arch/arm64/configs/exynos8895-greatlte_defconfig | 8 ++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/arch/arm64/configs/exynos8895-dream2lte_defconfig b/arch/arm64/configs/exynos8895-dream2lte_defconfig index 1c6e8974446c..46d8db0a9a0e 100644 --- a/arch/arm64/configs/exynos8895-dream2lte_defconfig +++ b/arch/arm64/configs/exynos8895-dream2lte_defconfig @@ -496,7 +496,6 @@ CONFIG_MMAP_READAROUND_LIMIT=32 CONFIG_LARGE_DIRTY_BUFFER=y CONFIG_MAX_DIRTY_THRESH_PAGES=76800 CONFIG_BALANCE_ANON_FILE_RECLAIM=y -CONFIG_RBIN=y CONFIG_SECCOMP=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -749,6 +748,7 @@ CONFIG_NF_CONNTRACK=y CONFIG_NF_LOG_COMMON=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y # CONFIG_NF_CONNTRACK_TIMEOUT is not set @@ -3662,7 +3662,6 @@ CONFIG_USB_SERIAL_PL2303=y # CONFIG_USB_PHY is not set # CONFIG_USB_OTG_WAKELOCK is not set # CONFIG_NOP_USB_XCEIV is not set -# CONFIG_DUAL_ROLE_USB_INTF is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_ULPI is not set @@ -3759,6 +3758,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y # # USB Power Delivery and Type-C drivers # +CONFIG_TYPEC=y # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set @@ -4111,7 +4111,6 @@ CONFIG_ION_TEST=y # CONFIG_ION_DUMMY is not set CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_STAT_LOG=y -CONFIG_ION_RBIN_HEAP=y # CONFIG_ION_EXYNOS_OF is not set # CONFIG_FIQ_DEBUGGER is not set # CONFIG_FIQ_WATCHDOG is not set @@ -4931,6 +4930,7 @@ CONFIG_FAT_VIRTUAL_XATTR=y CONFIG_FAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0" CONFIG_FAT_SUPPORT_STLOG=y CONFIG_SDFAT_FS=y +CONFIG_SDFAT_USE_FOR_EXFAT=y CONFIG_SDFAT_DELAYED_META_DIRTY=y CONFIG_SDFAT_SUPPORT_DIR_SYNC=y CONFIG_SDFAT_DEFAULT_CODEPAGE=437 @@ -5008,6 +5008,7 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_AFS_FS is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -5031,6 +5032,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -5054,6 +5056,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_MAC_INUIT is not set # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm64/configs/exynos8895-dreamlte_defconfig b/arch/arm64/configs/exynos8895-dreamlte_defconfig index f30a4d6ae9ae..9492433a9476 100644 --- a/arch/arm64/configs/exynos8895-dreamlte_defconfig +++ b/arch/arm64/configs/exynos8895-dreamlte_defconfig @@ -496,7 +496,6 @@ CONFIG_MMAP_READAROUND_LIMIT=32 CONFIG_LARGE_DIRTY_BUFFER=y CONFIG_MAX_DIRTY_THRESH_PAGES=76800 CONFIG_BALANCE_ANON_FILE_RECLAIM=y -CONFIG_RBIN=y CONFIG_SECCOMP=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -749,6 +748,7 @@ CONFIG_NF_CONNTRACK=y CONFIG_NF_LOG_COMMON=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y # CONFIG_NF_CONNTRACK_TIMEOUT is not set @@ -3662,7 +3662,6 @@ CONFIG_USB_SERIAL_PL2303=y # CONFIG_USB_PHY is not set # CONFIG_USB_OTG_WAKELOCK is not set # CONFIG_NOP_USB_XCEIV is not set -# CONFIG_DUAL_ROLE_USB_INTF is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_ULPI is not set @@ -3759,6 +3758,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y # # USB Power Delivery and Type-C drivers # +CONFIG_TYPEC=y # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set @@ -4111,7 +4111,6 @@ CONFIG_ION_TEST=y # CONFIG_ION_DUMMY is not set CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_STAT_LOG=y -CONFIG_ION_RBIN_HEAP=y # CONFIG_ION_EXYNOS_OF is not set # CONFIG_FIQ_DEBUGGER is not set # CONFIG_FIQ_WATCHDOG is not set @@ -4931,6 +4930,7 @@ CONFIG_FAT_VIRTUAL_XATTR=y CONFIG_FAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0" CONFIG_FAT_SUPPORT_STLOG=y CONFIG_SDFAT_FS=y +CONFIG_SDFAT_USE_FOR_EXFAT=y CONFIG_SDFAT_DELAYED_META_DIRTY=y CONFIG_SDFAT_SUPPORT_DIR_SYNC=y CONFIG_SDFAT_DEFAULT_CODEPAGE=437 @@ -5008,6 +5008,7 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_AFS_FS is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -5031,6 +5032,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -5054,6 +5056,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_MAC_INUIT is not set # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # CONFIG_VIRTUALIZATION is not set diff --git a/arch/arm64/configs/exynos8895-greatlte_defconfig b/arch/arm64/configs/exynos8895-greatlte_defconfig index d0174a5cb7ab..b3d16d4777d0 100644 --- a/arch/arm64/configs/exynos8895-greatlte_defconfig +++ b/arch/arm64/configs/exynos8895-greatlte_defconfig @@ -498,7 +498,6 @@ CONFIG_MMAP_READAROUND_LIMIT=32 CONFIG_LARGE_DIRTY_BUFFER=y CONFIG_MAX_DIRTY_THRESH_PAGES=76800 CONFIG_BALANCE_ANON_FILE_RECLAIM=y -# CONFIG_RBIN is not set CONFIG_SECCOMP=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 @@ -751,6 +750,7 @@ CONFIG_NF_CONNTRACK=y CONFIG_NF_LOG_COMMON=y CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y # CONFIG_NF_CONNTRACK_TIMEOUT is not set @@ -3664,7 +3664,6 @@ CONFIG_USB_SERIAL_PL2303=y # CONFIG_USB_PHY is not set # CONFIG_USB_OTG_WAKELOCK is not set # CONFIG_NOP_USB_XCEIV is not set -# CONFIG_DUAL_ROLE_USB_INTF is not set # CONFIG_USB_GPIO_VBUS is not set # CONFIG_USB_ISP1301 is not set # CONFIG_USB_ULPI is not set @@ -3761,6 +3760,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y # # USB Power Delivery and Type-C drivers # +CONFIG_TYPEC=y # CONFIG_UWB is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set @@ -4934,6 +4934,7 @@ CONFIG_FAT_VIRTUAL_XATTR=y CONFIG_FAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0" CONFIG_FAT_SUPPORT_STLOG=y CONFIG_SDFAT_FS=y +CONFIG_SDFAT_USE_FOR_EXFAT=y CONFIG_SDFAT_DELAYED_META_DIRTY=y CONFIG_SDFAT_SUPPORT_DIR_SYNC=y CONFIG_SDFAT_DEFAULT_CODEPAGE=437 @@ -5011,6 +5012,7 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_AFS_FS is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set # CONFIG_NLS_CODEPAGE_850 is not set @@ -5034,6 +5036,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -5057,6 +5060,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NLS_MAC_INUIT is not set # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # CONFIG_VIRTUALIZATION is not set -- 2.20.1