From 254d8e81d28352df8602c92d917804bef3c5a992 Mon Sep 17 00:00:00 2001 From: Hajun Sung Date: Thu, 12 Aug 2021 19:52:33 +0900 Subject: [PATCH] ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC Enable CONFIG_NFC to support GKI general android device. When we set CONFIG_NFC=m for driver enable, nfc.ko module needs many network ABI. So, make CONFIG_NFC=y in gki kernel to ensure all other nfc device can use without adding ABI list. - ABI list needed by nfc.ko (CONFIG_NFC=m) add_wait_queue add_wait_queue_exclusive capable class_dev_iter_exit class_dev_iter_init class_dev_iter_next _copy_from_iter_full datagram_poll default_wake_function lock_sock_nested nla_strlcpy proto_register proto_unregister __pskb_copy_fclone release_sock remove_wait_queue security_sock_graft sk_alloc skb_copy_datagram_iter skb_free_datagram skb_recv_datagram skb_unlink sk_free sock_alloc_send_skb sock_init_data sock_no_accept sock_no_bind sock_no_connect sock_no_getname sock_no_ioctl sock_no_listen sock_no_mmap sock_no_sendmsg sock_no_shutdown sock_no_socketpair sock_queue_rcv_skb __sock_recv_timestamp __sock_recv_wifi_status sock_register sock_unregister Bug: 196480985 Change-Id: Ie6f0d4bec65c1e2663493e9165b7072dea7c5348 Signed-off-by: Hajun Sung (cherry picked from commit c72ca115a2d4732fe710c17d209db22834919156) --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 8d175793af25..e0b84c64aaf8 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -264,6 +264,7 @@ CONFIG_NL80211_TESTMODE=y # CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=y CONFIG_RFKILL=y +CONFIG_NFC=y CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCI_IOV=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 1fd452250d15..7ba8d4e51fc7 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -246,6 +246,7 @@ CONFIG_NL80211_TESTMODE=y # CONFIG_CFG80211_CRDA_SUPPORT is not set CONFIG_MAC80211=y CONFIG_RFKILL=y +CONFIG_NFC=y CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_PCI_MSI=y