diff --git a/kernel/configs/android-base-conditional.config b/kernel/configs/android-base-conditional.config new file mode 100644 index 000000000000..0fb80919f95d --- /dev/null +++ b/kernel/configs/android-base-conditional.config @@ -0,0 +1,16 @@ +# KEEP ALPHABETICALLY SORTED +CONFIG_ARM64=y +CONFIG_ARM64_PAN=y +CONFIG_ARM64_SW_TTBR0_PAN=y +CONFIG_ARMV8_DEPRECATED=y +CONFIG_COMPAT=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_SETEND_EMULATION=y +CONFIG_SHADOW_CALL_STACK=y +CONFIG_SWP_EMULATION=y +CONFIG_BPF_JIT_ALWAYS_ON=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_KFENCE=y +CONFIG_USERFAULTFD=y diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index eb701b2ac72f..42eb70f4cfb9 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -1,44 +1,96 @@ # KEEP ALPHABETICALLY SORTED +# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set +# CONFIG_ANDROID_PARANOID_NETWORK is not set +# CONFIG_BPFILTER is not set # CONFIG_DEVMEM is not set # CONFIG_FHANDLE is not set -# CONFIG_INET_LRO is not set +# CONFIG_FW_CACHE is not set +# CONFIG_IP6_NF_NAT is not set +# CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_NFSD is not set # CONFIG_NFS_FS is not set -# CONFIG_OABI_COMPAT is not set +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_RT_GROUP_SCHED is not set # CONFIG_SYSVIPC is not set # CONFIG_USELIB is not set +CONFIG_ADVISE_SYSCALLS=y +CONFIG_AIO=y CONFIG_ANDROID=y +CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ARMV8_DEPRECATED=y +CONFIG_ANDROID_BINDERFS=y CONFIG_ASHMEM=y +CONFIG_AS_IS_LLVM=y CONFIG_AUDIT=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_SCRIPT=y CONFIG_BLK_DEV_INITRD=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLOCK=y +CONFIG_BPF_JIT=y +CONFIG_BPF_SYSCALL=y +CONFIG_CC_IS_CLANG=y CONFIG_CGROUPS=y CONFIG_CGROUP_BPF=y CONFIG_CGROUP_CPUACCT=y -CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y -CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_XCBC=y +CONFIG_DEBUG_LIST=y CONFIG_DEFAULT_SECURITY_SELINUX=y +CONFIG_DM_DEFAULT_KEY=y +CONFIG_DM_SNAPSHOT=y +CONFIG_DM_VERITY=y +CONFIG_DUMMY=y CONFIG_EMBEDDED=y -CONFIG_FB=y +CONFIG_EPOLL=y +CONFIG_EVENTFD=y +CONFIG_FILE_LOCKING=y +CONFIG_FS_ENCRYPTION=y +CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y +CONFIG_FS_VERITY=y +CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y +CONFIG_FUSE_FS=y +CONFIG_FUTEX=y CONFIG_HARDENED_USERCOPY=y +CONFIG_HID_GENERIC=y +CONFIG_HID_PLAYSTATION=y +CONFIG_PLAYSTATION_FF=y +CONFIG_HIDRAW=y +CONFIG_HID_SONY=y +CONFIG_SONY_FF=y CONFIG_HIGH_RES_TIMERS=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_INET=y CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_ESP=y -CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_UDP_DIAG=y +CONFIG_INOTIFY_USER=y +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_JOYSTICK=y CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_IPTABLES=y CONFIG_IP6_NF_MANGLE=y +CONFIG_IP6_NF_MATCH_RPFILTER=y CONFIG_IP6_NF_RAW=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IPV6=y @@ -47,6 +99,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_OPTIMISTIC_DAD=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_VTI=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_MULTICAST=y CONFIG_IP_MULTIPLE_TABLES=y @@ -56,7 +109,6 @@ CONFIG_IP_NF_ARP_MANGLE=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MANGLE=y -CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_NAT=y @@ -66,13 +118,22 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_NETMAP=y CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_JOYSTICK_XPAD=y +CONFIG_L2TP=y +CONFIG_LD_IS_LLD=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_MD=y +CONFIG_MEMBARRIER=y +CONFIG_MMU=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y +CONFIG_MULTIUSER=y +CONFIG_NAMESPACES=y CONFIG_NET=y CONFIG_NETDEVICES=y CONFIG_NETFILTER=y -CONFIG_NETFILTER_TPROXY=y +CONFIG_NETFILTER_XT_MATCH_BPF=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y CONFIG_NETFILTER_XT_MATCH_CONNMARK=y @@ -84,8 +145,11 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2=y +CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y @@ -96,6 +160,7 @@ CONFIG_NETFILTER_XT_MATCH_U32=y CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y @@ -105,19 +170,22 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y CONFIG_NET_CLS_ACT=y +CONFIG_NET_CLS_BPF=y CONFIG_NET_CLS_U32=y CONFIG_NET_EMATCH=y CONFIG_NET_EMATCH_U32=y +CONFIG_NET_IPGRE_DEMUX=y +CONFIG_NET_IPVTI=y CONFIG_NET_KEY=y +CONFIG_NET_NS=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_HTB=y +CONFIG_NET_SCH_INGRESS=y CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_FTP=y CONFIG_NF_CONNTRACK_H323=y -CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_CONNTRACK_IRC=y CONFIG_NF_CONNTRACK_NETBIOS_NS=y CONFIG_NF_CONNTRACK_PPTP=y @@ -129,32 +197,68 @@ CONFIG_NF_CT_PROTO_DCCP=y CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_NAT=y +CONFIG_NF_SOCKET_IPV4=y +CONFIG_NF_SOCKET_IPV6=y CONFIG_NO_HZ=y CONFIG_PACKET=y -CONFIG_PM_AUTOSLEEP=y CONFIG_PM_WAKELOCKS=y +CONFIG_POSIX_TIMERS=y CONFIG_PPP=y +CONFIG_PPPOL2TP=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y +CONFIG_PPTP=y CONFIG_PREEMPT=y +CONFIG_PROC_FS=y +CONFIG_PROFILING=y +CONFIG_PSI=y +CONFIG_QFMT_V2=y CONFIG_QUOTA=y -CONFIG_RANDOMIZE_BASE=y +CONFIG_QUOTACTL=y +CONFIG_RD_LZ4=y CONFIG_RTC_CLASS=y -CONFIG_RT_GROUP_SCHED=y +CONFIG_SCHED_DEBUG=y CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y -CONFIG_SETEND_EMULATION=y +CONFIG_SHMEM=y +CONFIG_SIGNALFD=y +CONFIG_SND=y +CONFIG_SOUND=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STAGING=y -CONFIG_SWP_EMULATION=y -CONFIG_SYNC=y +CONFIG_STATIC_USERMODEHELPER=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_SUSPEND=y +CONFIG_SYNC_FILE=y +CONFIG_SYSFS=y +CONFIG_TASKSTATS=y +CONFIG_TASK_IO_ACCOUNTING=y +CONFIG_TASK_XACCT=y +CONFIG_TIMERFD=y +CONFIG_TRACE_GPU_MEM=y +CONFIG_TTY=y CONFIG_TUN=y +CONFIG_UHID=y +CONFIG_UID_SYS_STATS=y CONFIG_UNIX=y -CONFIG_USB_GADGET=y +CONFIG_USB=y CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_F_ACC=y +CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_F_MIDI=y -CONFIG_USB_OTG_WAKELOCK=y +CONFIG_USB_CONFIGFS_UEVENT=y +CONFIG_USB_GADGET=y +CONFIG_USB_SUPPORT=y +CONFIG_UTS_NS=y +CONFIG_VETH=y +CONFIG_XFRM_INTERFACE=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y CONFIG_XFRM_USER=y diff --git a/kernel/configs/android-recommended-arm64.config b/kernel/configs/android-recommended-arm64.config new file mode 100644 index 000000000000..2b96afa5c25d --- /dev/null +++ b/kernel/configs/android-recommended-arm64.config @@ -0,0 +1,6 @@ +# KEEP ALPHABETICALLY SORTED +CONFIG_ARM64_CRYPTO=y +CONFIG_ARM64_SW_TTBR0_PAN=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_RELOCATABLE=y diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index eb0029c9a6a6..de28508ae657 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -1,29 +1,32 @@ # KEEP ALPHABETICALLY SORTED -# CONFIG_AIO is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_INPUT_MOUSE is not set +# CONFIG_KSM is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_PM_WAKELOCKS_GC is not set # CONFIG_VT is not set -CONFIG_ARM64_SW_TTBR0_PAN=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BLK_DEV_DM=y -CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_STACKPROTECTOR_STRONG=y CONFIG_COMPACTION=y -CONFIG_CPU_SW_DOMAIN_PAN=y +CONFIG_CONFIGFS_FS=y +CONFIG_COREDUMP=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_DM_BOW=y CONFIG_DM_CRYPT=y CONFIG_DM_UEVENT=y -CONFIG_DM_VERITY=y CONFIG_DM_VERITY_FEC=y CONFIG_DRAGONRISE_FF=y +CONFIG_ELF_CORE=y CONFIG_ENABLE_DEFAULT_TRACERS=y +CONFIG_ENERGY_MODEL=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_SECURITY=y -CONFIG_FUSE_FS=y +CONFIG_F2FS_FS=y +CONFIG_F2FS_FS_SECURITY=y +CONFIG_FTRACE=y CONFIG_GREENASIA_FF=y CONFIG_HIDRAW=y CONFIG_HID_A4TECH=y @@ -62,8 +65,8 @@ CONFIG_HID_ROCCAT=y CONFIG_HID_SAITEK=y CONFIG_HID_SAMSUNG=y CONFIG_HID_SMARTJOYPLUS=y -CONFIG_HID_SONY=y CONFIG_HID_SPEEDLINK=y +CONFIG_HID_STEAM=y CONFIG_HID_SUNPLUS=y CONFIG_HID_THRUSTMASTER=y CONFIG_HID_TIVO=y @@ -75,53 +78,54 @@ CONFIG_HID_WALTOP=y CONFIG_HID_WIIMOTE=y CONFIG_HID_ZEROPLUS=y CONFIG_HID_ZYDACRON=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_GPIO=y -CONFIG_INPUT_JOYSTICK=y CONFIG_INPUT_MISC=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_UINPUT=y -CONFIG_JOYSTICK_XPAD=y +CONFIG_ION=y CONFIG_JOYSTICK_XPAD_FF=y CONFIG_JOYSTICK_XPAD_LEDS=y +CONFIG_KALLSYMS=y CONFIG_KALLSYMS_ALL=y -CONFIG_KSM=y +CONFIG_KEYS=y CONFIG_LOGIG940_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGITECH_FF=y -CONFIG_MD=y CONFIG_MEDIA_SUPPORT=y +CONFIG_MISC_FILESYSTEMS=y CONFIG_MSDOS_FS=y +CONFIG_NET_SCH_NETEM=y +CONFIG_OVERLAY_FS=y CONFIG_PANIC_TIMEOUT=5 CONFIG_PANTHERLORD_FF=y CONFIG_PERF_EVENTS=y CONFIG_PM_DEBUG=y -CONFIG_PM_RUNTIME=y -CONFIG_PM_WAKELOCKS_LIMIT=0 CONFIG_POWER_SUPPLY=y +CONFIG_PSI=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_RAM=y +CONFIG_REFCOUNT_FULL=y CONFIG_SCHEDSTATS=y +CONFIG_SDCARD_FS=y CONFIG_SMARTJOYPLUS_FF=y +CONFIG_SMP=y CONFIG_SND=y CONFIG_SOUND=y CONFIG_STRICT_KERNEL_RWX=y -CONFIG_SUSPEND_TIME=y CONFIG_TABLET_USB_ACECAD=y CONFIG_TABLET_USB_AIPTEK=y +CONFIG_TABLET_USB_GTCO=y CONFIG_TABLET_USB_HANWANG=y CONFIG_TABLET_USB_KBTAB=y -CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_TASK_XACCT=y -CONFIG_TIMER_STATS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_UHID=y +CONFIG_UCLAMP_TASK=y +CONFIG_UCLAMP_TASK_GROUP=y +CONFIG_UPROBE_EVENTS=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_HIDDEV=y +CONFIG_USB_RTL8152=y CONFIG_USB_USBNET=y CONFIG_VFAT_FS=y