From c250cd6ebb7fd69045ec5c860e5da520936e0516 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Tue, 9 Aug 2016 16:22:43 +0530 Subject: [PATCH] ANDROID: configs: merge AOSP config fragments Upstream now supports AOSP kernel config fragments: commit 27eb6622ab67 ("config: add android config fragments"). This patch merge non-upstream AOSP config fragments from android/configs/android-* of common kernel experimental/android-4.9 to kernel/configs/android-*. Added initial set of AOSP config fragments and a README.android, from AOSP Change-ID: I3a4883f3b04d2820e90ceb3c4d02390d6458d6ce ("android: configs: Initial commit of Android config fragments"), to explain the purpose of Android config fragments and how to use them to generate a device config compatible with Android. Signed-off-by: Amit Pundir --- kernel/configs/README.android | 15 +++++++++++++++ kernel/configs/android-base.config | 5 +++++ kernel/configs/android-recommended.config | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 kernel/configs/README.android diff --git a/kernel/configs/README.android b/kernel/configs/README.android new file mode 100644 index 000000000000..2e2d7c001275 --- /dev/null +++ b/kernel/configs/README.android @@ -0,0 +1,15 @@ +The android-*.config files in this directory are meant to be used as a base +for an Android kernel config. All devices should have the options in +android-base.config enabled. While not mandatory, the options in +android-recommended.config enable advanced Android features. + +Assuming you already have a minimalist defconfig for your device, a possible +way to enable these options would be: + + ARCH= scripts/kconfig/merge_config.sh /_defconfig kernel/configs/android-base.config kernel/configs/android-recommended.config + +This will generate a .config that can then be used to save a new defconfig or +compile a new kernel with Android features enabled. + +Because there is no tool to consistently generate these config fragments, +lets keep them alphabetically sorted instead of random. diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 1a8f34f63601..bd645375535f 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -76,6 +76,9 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_POLICY=y +CONFIG_NETFILTER_XT_MATCH_QTAGUID=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 @@ -124,6 +127,8 @@ CONFIG_PACKET=y CONFIG_PM_AUTOSLEEP=y CONFIG_PM_WAKELOCKS=y CONFIG_PPP=y +CONFIG_PPPOLAC=y +CONFIG_PPPOPNS=y CONFIG_PPP_BSDCOMP=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config index 297756be369c..137885234cac 100644 --- a/kernel/configs/android-recommended.config +++ b/kernel/configs/android-recommended.config @@ -75,6 +75,8 @@ CONFIG_HID_ZYDACRON=y CONFIG_INPUT_EVDEV=y CONFIG_INPUT_GPIO=y CONFIG_INPUT_JOYSTICK=y +CONFIG_INPUT_KEYCHORD=y +CONFIG_INPUT_KEYRESET=y CONFIG_INPUT_MISC=y CONFIG_INPUT_TABLET=y CONFIG_INPUT_UINPUT=y