Merge pull request #39 from Flamefire/cuttlefish (65e781d4) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm64/configs/cuttlefish_defconfig

+13 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ CONFIG_CGROUP_SCHEDTUNE=y
		CONFIG_MEMCG=y
		CONFIG_MEMCG_SWAP=y
		CONFIG_RT_GROUP_SCHED=y
		CONFIG_BLK_CGROUP=y
		CONFIG_NAMESPACES=y
		CONFIG_SCHED_AUTOGROUP=y
		CONFIG_SCHED_TUNE=y
		CONFIG_DEFAULT_USE_ENERGY_AWARE=y
		@@ -44,8 +46,6 @@ CONFIG_PCI_HOST_GENERIC=y
		CONFIG_PREEMPT=y
		CONFIG_HZ_100=y
		# CONFIG_SPARSEMEM_VMEMMAP is not set
		CONFIG_KSM=y
		CONFIG_TRANSPARENT_HUGEPAGE=y
		CONFIG_ZSMALLOC=y
		CONFIG_SECCOMP=y
		CONFIG_ARMV8_DEPRECATED=y
		@@ -54,7 +54,6 @@ CONFIG_CP15_BARRIER_EMULATION=y
		CONFIG_SETEND_EMULATION=y
		CONFIG_ARM64_SW_TTBR0_PAN=y
		CONFIG_RANDOMIZE_BASE=y
		# CONFIG_EFI is not set
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		CONFIG_COMPAT=y
		CONFIG_PM_WAKELOCKS=y
		@@ -188,6 +187,7 @@ CONFIG_DEBUG_DEVRES=y
		CONFIG_OF_UNITTEST=y
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_VIRTIO_BLK=y
		@@ -197,12 +197,15 @@ CONFIG_SCSI=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_SCSI_VIRTIO=y
		CONFIG_MD=y
		CONFIG_BLK_DEV_MD=y
		CONFIG_MD_LINEAR=y
		CONFIG_BLK_DEV_DM=y
		CONFIG_DM_CRYPT=y
		CONFIG_DM_UEVENT=y
		CONFIG_DM_VERITY=y
		CONFIG_DM_VERITY_FEC=y
		CONFIG_DM_VERITY_AVB=y
		CONFIG_DM_ANDROID_VERITY=y
		CONFIG_NETDEVICES=y
		CONFIG_NETCONSOLE=y
		CONFIG_NETCONSOLE_DYNAMIC=y
		@@ -386,6 +389,7 @@ CONFIG_MSDOS_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		# CONFIG_EFIVAR_FS is not set
		CONFIG_SDCARD_FS=y
		CONFIG_PSTORE=y
		CONFIG_PSTORE_CONSOLE=y
		@@ -410,7 +414,13 @@ CONFIG_SECURITY_NETWORK=y
		CONFIG_LSM_MMAP_MIN_ADDR=65536
		CONFIG_HARDENED_USERCOPY=y
		CONFIG_SECURITY_SELINUX=y
		CONFIG_CRYPTO_RSA=y
		CONFIG_CRYPTO_SHA512=y
		CONFIG_CRYPTO_LZ4=y
		CONFIG_CRYPTO_ANSI_CPRNG=y
		CONFIG_ASYMMETRIC_KEY_TYPE=y
		CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
		CONFIG_X509_CERTIFICATE_PARSER=y
		CONFIG_SYSTEM_TRUSTED_KEYRING=y
		CONFIG_SYSTEM_TRUSTED_KEYS="verity_dev_keys.x509"
		CONFIG_XZ_DEC=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+6 −3

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ CONFIG_CGROUP_CPUACCT=y
		CONFIG_CGROUP_SCHEDTUNE=y
		CONFIG_CGROUP_SCHED=y
		CONFIG_RT_GROUP_SCHED=y
		CONFIG_BLK_CGROUP=y
		CONFIG_NAMESPACES=y
		CONFIG_SCHED_TUNE=y
		CONFIG_BLK_DEV_INITRD=y
		@@ -48,11 +49,10 @@ CONFIG_PREEMPT=y
		# CONFIG_MICROCODE is not set
		CONFIG_X86_MSR=y
		CONFIG_X86_CPUID=y
		CONFIG_KSM=y
		CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
		CONFIG_TRANSPARENT_HUGEPAGE=y
		CONFIG_ZSMALLOC=y
		# CONFIG_MTRR is not set
		CONFIG_EFI=y
		CONFIG_HZ_100=y
		CONFIG_KEXEC=y
		CONFIG_CRASH_DUMP=y
		@@ -60,7 +60,7 @@ CONFIG_PHYSICAL_START=0x200000
		CONFIG_RANDOMIZE_BASE=y
		CONFIG_PHYSICAL_ALIGN=0x1000000
		CONFIG_CMDLINE_BOOL=y
		CONFIG_CMDLINE="console=ttyS0 reboot=p nopti"
		CONFIG_CMDLINE="nopti"
		CONFIG_PM_AUTOSLEEP=y
		CONFIG_PM_WAKELOCKS=y
		CONFIG_PM_WAKELOCKS_LIMIT=0
		@@ -206,6 +206,7 @@ CONFIG_OF_UNITTEST=y
		# CONFIG_PNP_DEBUG_MESSAGES is not set
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_LOOP_MIN_COUNT=16
		CONFIG_BLK_DEV_RAM=y
		CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_VIRTIO_BLK=y
		@@ -228,6 +229,7 @@ CONFIG_DM_ZERO=y
		CONFIG_DM_UEVENT=y
		CONFIG_DM_VERITY=y
		CONFIG_DM_VERITY_FEC=y
		CONFIG_DM_VERITY_AVB=y
		CONFIG_DM_ANDROID_VERITY=y
		CONFIG_NETDEVICES=y
		CONFIG_NETCONSOLE=y
		@@ -425,6 +427,7 @@ CONFIG_PROC_KCORE=y
		CONFIG_TMPFS=y
		CONFIG_TMPFS_POSIX_ACL=y
		CONFIG_HUGETLBFS=y
		# CONFIG_EFIVAR_FS is not set
		CONFIG_SDCARD_FS=y
		CONFIG_PSTORE=y
		CONFIG_PSTORE_CONSOLE=y