From edf7e6d53c08e3ceb6ede2b12528163cc8028531 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Mon, 20 May 2019 11:54:22 -0700 Subject: [PATCH] ANDROID: sync defconfigs with savedefconfig Test: boot gki_defconfig and cuttlefish_defconfig on arm64 cuttlefish Signed-off-by: Tri Vo Change-Id: Ie0b518c0fd5100a39312069fe3b193684feb634d --- arch/arm64/configs/cuttlefish_defconfig | 7 ++----- arch/arm64/configs/gki_defconfig | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 5f7157425a31..41502bd397dd 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -38,14 +38,14 @@ CONFIG_SCHED_MC=y CONFIG_HZ_100=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y +CONFIG_ARM64_SW_TTBR0_PAN=y +CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y 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_COMPAT=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set @@ -66,7 +66,6 @@ CONFIG_ARM_SCMI_PROTOCOL=y CONFIG_ARM_SCPI_PROTOCOL=y # CONFIG_ARM_SCPI_POWER_DOMAIN is not set CONFIG_KPROBES=y -CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y @@ -89,7 +88,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_NET_IPGRE_DEMUX=y CONFIG_NET_IPVTI=y CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y CONFIG_TCP_CONG_ADVANCED=y @@ -193,7 +191,6 @@ CONFIG_MAC80211=y CONFIG_RFKILL=y CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y -# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index b833007cd315..1f8563c00979 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -35,13 +35,13 @@ CONFIG_PROFILING=y CONFIG_SCHED_MC=y CONFIG_SECCOMP=y CONFIG_PARAVIRT=y +CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_EFI is not set -CONFIG_COMPAT=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0 # CONFIG_PM_WAKELOCKS_GC is not set @@ -81,7 +81,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_NET_IPGRE_DEMUX=y CONFIG_NET_IPVTI=y CONFIG_INET_ESP=y -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y @@ -180,7 +179,6 @@ CONFIG_MAC80211=y CONFIG_RFKILL=y CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y -# CONFIG_UEVENT_HELPER is not set # CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_DEBUG_DEVRES=y CONFIG_ZRAM=y @@ -282,7 +280,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y # CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_DRM_VIRTIO_GPU=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y