Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c250cd6e authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

ANDROID: configs: merge AOSP config fragments



Upstream now supports AOSP kernel config fragments:
commit 27eb6622 ("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: default avatarAmit Pundir <amit.pundir@linaro.org>
parent ad3c02f8
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
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=<arch> scripts/kconfig/merge_config.sh <path_to>/<device>_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.
+5 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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