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

Commit 1fcf2250 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sdmshrike: defconfig: Add support SHIPPING_API_LEVEL=29"

parents e0288dd0 2950fa35

arch/arm64/configs/vendor/sdmshrike-perf_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ CONFIG_BLK_DEV_INITRD=y 
# CONFIG_RD_LZ4 is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

# CONFIG_MEMBARRIER is not set

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -78,7 +77,6 @@ CONFIG_SETEND_EMULATION=y 
CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS 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
@@ -95,6 +93,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -105,6 +104,7 @@ CONFIG_IP_ROUTE_VERBOSE=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -117,6 +117,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -295,6 +296,7 @@ CONFIG_PPPOLAC=y 
CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_RTL8152=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_WCNSS_MEM_PRE_ALLOC=y
@@ -638,7 +640,9 @@ CONFIG_CORESIGHT_DUMMY=y 
CONFIG_CORESIGHT_REMOTE_ETM=y

CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0

CONFIG_CORESIGHT_EVENT=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

arch/arm64/configs/vendor/sdmshrike_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

# CONFIG_MEMBARRIER is not set

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y
@@ -84,7 +83,6 @@ CONFIG_SETEND_EMULATION=y 
CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS 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
@@ -102,6 +100,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_INTERFACE=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y
@@ -112,6 +111,7 @@ CONFIG_IP_ROUTE_VERBOSE=y 
CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -124,6 +124,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -307,6 +308,7 @@ CONFIG_PPPOLAC=y 
CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_RTL8152=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_WCNSS_MEM_PRE_ALLOC=y
@@ -715,7 +717,9 @@ CONFIG_CORESIGHT_REMOTE_ETM_DEFAULT_ENABLE=0 
CONFIG_CORESIGHT_TGU=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_PFK=y

CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y

CONFIG_SECURITY=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y