From 63ea80092d04624189f49328fb00f12d2930dc48 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 13 Oct 2021 13:40:55 -0700 Subject: [PATCH] Revert "ANDROID: arm64: gki_defconfig: Enable ARCH_EXYNOS" This reverts commit 2344019e040ef0f6f5cce711a0b8d61a91384677. We can't enable ARCH_EXYNOS in the gki_defconfig because it selects several exynos drivers as built-in. Not only do we not want to maintain these drivers in GKI, doing so also doesn't allow our partner to modularize those driver. If ARCH_EXYNOS wants to be enabled, then Samsung needs to decouple ARCH_EXYNOS from the drivers it selects upstream. This was unsuccessfully attempted in [1] due to the inability to test the changes. [1] https://lore.kernel.org/all/20210928235635.1348330-1-willmcvicker@google.com/ Bug: 142159113 Bug: 145560197 Change-Id: I3e567e8e3a67710852c398c8a27a7005859cf41e Signed-off-by: Will McVicker --- arch/arm64/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 3f16d5cefda8..12fd514a7c70 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -48,7 +48,6 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SHUFFLE_PAGE_ALLOCATOR=y CONFIG_PROFILING=y CONFIG_ARCH_SUNXI=y -CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_HISI=y CONFIG_ARCH_QCOM=y CONFIG_SCHED_MC=y @@ -530,6 +529,7 @@ CONFIG_IIO=y CONFIG_IIO_BUFFER=y CONFIG_IIO_TRIGGER=y CONFIG_PWM=y +CONFIG_GENERIC_PHY=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y