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

Commit bc5795a4 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko
Browse files

defconfig: 8084: Sync kernel configuration to Android baseline 



Sync apq8084_defconfig and apq8084-perf_defconfig with the
Android baseline kernel configuration fragment, ensuring
that kernel options required for Android are enabled. The
CONFIG_EXPERIMENTAL=y and CONFIG_MODULE=n are omitted due
to relaxed testing requirements. CONFIG_USB_OTG_WAKELOCK=y
is omitted because the existing USB driver already provides
the equivalent functionality.

Change-Id: Ia596a9e13cac56b4b02d93174724d88954f28cb6
Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
parent c936945a

arch/arm/configs/apq8084-perf_defconfig

+19 −2
Original line number Diff line number Diff line
@@ -105,12 +105,15 @@ CONFIG_PM_RUNTIME=y 
CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -127,7 +130,6 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -150,7 +152,10 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y 
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

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_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
@@ -183,6 +188,11 @@ CONFIG_IP_NF_MATCH_ECN=y 
CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_REJECT_SKERR=y

CONFIG_NF_NAT_IPV4=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
@@ -193,6 +203,7 @@ CONFIG_NF_CONNTRACK_IPV6=y 
CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_NET_SCHED=y
@@ -245,6 +256,12 @@ CONFIG_DUMMY=y 
CONFIG_TUN=y

CONFIG_KS8851=m

# CONFIG_MSM_RMNET is not set

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_SLIP=y

CONFIG_SLIP_COMPRESSED=y

CONFIG_SLIP_MODE_SLIP6=y
@@ -390,6 +407,7 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOGGER=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ANDROID_INTF_ALARM_DEV=y

CONFIG_MSM_SSBI=y

CONFIG_SPS=y

CONFIG_USB_BAM=y
@@ -431,7 +449,6 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=y

arch/arm/configs/apq8084_defconfig

+30 −3
Original line number Diff line number Diff line
@@ -108,12 +108,15 @@ CONFIG_PM_RUNTIME=y 
CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -130,7 +133,6 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -153,7 +155,10 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y 
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_MARK=y

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_SECMARK=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
@@ -186,6 +191,11 @@ CONFIG_IP_NF_MATCH_ECN=y 
CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_REJECT_SKERR=y

CONFIG_NF_NAT_IPV4=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
@@ -196,6 +206,7 @@ CONFIG_NF_CONNTRACK_IPV6=y 
CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_NET_SCHED=y
@@ -249,6 +260,12 @@ CONFIG_DUMMY=y 
CONFIG_TUN=y

CONFIG_KS8851=m

# CONFIG_MSM_RMNET is not set

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_SLIP=y

CONFIG_SLIP_COMPRESSED=y

CONFIG_SLIP_MODE_SLIP6=y
@@ -317,6 +334,17 @@ CONFIG_VIDEOBUF2_MSM_MEM=y 
CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_IMX135=y

CONFIG_IMX132=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_WFD=y

CONFIG_ION=y
@@ -401,12 +429,12 @@ CONFIG_ASHMEM=y 
CONFIG_ANDROID_LOGGER=y

CONFIG_ANDROID_TIMED_GPIO=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ANDROID_INTF_ALARM_DEV=y

CONFIG_MSM_SSBI=y

CONFIG_SPS=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_BAMDMA=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_MSM_PCIE=y

CONFIG_QPNP_POWER_ON=y

CONFIG_QPNP_CLKDIV=y

CONFIG_QPNP_USB_DETECT=y
@@ -477,7 +505,6 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=y