Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4891680e authored by Matt Wagantall's avatar Matt Wagantall Committed by Gerrit - the friendly Code Review server
Browse files

defconfig: arm64: msm: enable android-base/recommended options 



android/configs/android-base.cfg and android-recommended.cfg contain
configuration options which are deemed to be, respectively, required
and recommended for Android systems. Adjust the state of several
options which have fallen out of sync with these recommendations.

Change-Id: I4e9499095df31816d11a109dfb96b345362b7db5
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent d9642cc2

arch/arm64/configs/msm-perf_defconfig

+19 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 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_CPU_IDLE=y

CONFIG_CPU_FREQ=y
@@ -104,12 +105,12 @@ CONFIG_NF_CONNTRACK_IRC=y 
CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_SIP=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -155,6 +156,8 @@ CONFIG_IP_NF_FILTER=y 
CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -217,6 +220,8 @@ CONFIG_CMA_SIZE_MBYTES=8 
CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_UID_STAT=y

CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_TI_DRV2667=y
@@ -235,6 +240,7 @@ CONFIG_MD=y 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_REQ_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=y
@@ -261,10 +267,12 @@ CONFIG_ATH_CARDS=y 
CONFIG_WIL6210=m

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_INPUT_KEYRESET=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TABLET=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y
@@ -274,8 +282,10 @@ CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH_TS=y 
CONFIG_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_INPUT_GPIO=y

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_SMD=y
@@ -377,20 +387,24 @@ CONFIG_FB_MSM=y 
CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_HDMI_PANEL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MSM8996=y

CONFIG_HIDRAW=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y
@@ -440,6 +454,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y
@@ -530,8 +545,10 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

CONFIG_NLS_CODEPAGE_437=y

arch/arm64/configs/msm_defconfig

+21 −2
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ 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_SUSPEND_TIME=y

CONFIG_CPU_IDLE=y

CONFIG_CPU_FREQ=y

CONFIG_SCHED_FREQ_INPUT=y
@@ -103,12 +106,12 @@ CONFIG_NF_CONNTRACK_IRC=y 
CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_SIP=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y

CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y
@@ -154,6 +157,8 @@ CONFIG_IP_NF_FILTER=y 
CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -216,6 +221,8 @@ CONFIG_CMA_SIZE_MBYTES=8 
CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_UID_STAT=y

CONFIG_QSEECOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_TI_DRV2667=y
@@ -234,6 +241,7 @@ CONFIG_MD=y 
CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_REQ_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_BONDING=y
@@ -260,10 +268,12 @@ CONFIG_ATH_CARDS=y 
CONFIG_WIL6210=m

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_INPUT_KEYRESET=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TABLET=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y

CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y
@@ -273,8 +283,10 @@ CONFIG_TOUCHSCREEN_ATMEL_MAXTOUCH_TS=y 
CONFIG_SECURE_TOUCH=y

CONFIG_TOUCHSCREEN_GEN_VKEYS=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_KEYCHORD=y

CONFIG_INPUT_UINPUT=y

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_INPUT_GPIO=y

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_HSL=y
@@ -379,20 +391,24 @@ CONFIG_FB_MSM_MDSS=y 
CONFIG_FB_MSM_MDSS_WRITEBACK=y

CONFIG_FB_MSM_MDSS_HDMI_PANEL=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MSM8996=y

CONFIG_HIDRAW=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y

CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y
@@ -442,6 +458,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y 
CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_SW_SYNC_USER=y

CONFIG_ION=y
@@ -543,8 +560,10 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

CONFIG_NLS_CODEPAGE_437=y