android: configs: Reorder config fragments, update README

Change-Id: I5ee4b794dcc00f74f26562e49a406ea292af63ee
(cherry picked from commit 9ebedefd06142c9bc812bfa23401031525002a76)

diff --git a/android/configs/README b/android/configs/README
index 391dffa6f85f5643ae70ddc48e8c9f4c26465282..8798731f89048e90e5b0e0becb5311b43fa0f5e1 100644 (file)
--- a/android/configs/README
+++ b/android/configs/README
@@ -11,3 +11,5 @@ way to enable these options would be:
 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/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 2b98436550cf2124e87d4e900c429ade73ef24ed..25162024f8896a3eb7dd0a8152b7ee35a0455ec9 100644 (file)
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -1,3 +1,4 @@
+#  KEEP ALPHABETICALLY SORTED
 # CONFIG_INET_LRO is not set
 # CONFIG_MODULES is not set
 # CONFIG_OABI_COMPAT is not set

diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg
index ca3cc8613366612ece7b2e3082adf742ba30bdfa..010276ed36b997ae7391ffcce23aae7a34857243 100644 (file)
--- a/android/configs/android-recommended.cfg
+++ b/android/configs/android-recommended.cfg
@@ -1,7 +1,4 @@
-CONFIG_PANIC_TIMEOUT=5
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PERF_EVENTS=y
-CONFIG_COMPACTION=y
+#  KEEP ALPHABETICALLY SORTED
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_LEGACY_PTYS is not set
@@ -15,6 +12,7 @@ CONFIG_BATTERY_ANDROID=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_COMPACTION=y
 CONFIG_DM_UEVENT=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_EXT4_FS=y
@@ -82,6 +80,7 @@ CONFIG_ION=y
 CONFIG_JOYSTICK_XPAD=y
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_KALLSYMS_ALL=y
 CONFIG_KSM=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
@@ -89,7 +88,9 @@ CONFIG_LOGITECH_FF=y
 CONFIG_MD=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MSDOS_FS=y
+CONFIG_PANIC_TIMEOUT=5
 CONFIG_PANTHERLORD_FF=y
+CONFIG_PERF_EVENTS=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_WAKELOCKS_LIMIT=0