Commit graph

65 commits

Author SHA1 Message Date
Dmitry Shmidt
a7cda8fc77 android-4.14: Initial version of configs am: cfe72a2573 am: 3d26bacf36
am: f1eb25af87

Change-Id: Ida0f24912d47b7dc91b80438a3d3916b11727a91
2018-01-25 02:56:14 +00:00
Dmitry Shmidt
f1eb25af87 android-4.14: Initial version of configs am: cfe72a2573
am: 3d26bacf36

Change-Id: I424c0054a56a37333ac0e7bd0109a6d8fddf6ce2
2018-01-25 02:54:43 +00:00
Dmitry Shmidt
3d26bacf36 android-4.14: Initial version of configs
am: cfe72a2573

Change-Id: Ib4bb1e5ea28ab3a1626bcd604d2813386904babf
2018-01-25 02:50:43 +00:00
Dmitry Shmidt
cfe72a2573 android-4.14: Initial version of configs
Bug: 72420439
Test: ARCH=arm64 ./scripts/kconfig/merge_config.sh
        configs/android-4.14/android-base.cfg
        configs/android-4.14/android-recommended.cfg
        configs/android-4.14/android-base-arm.cfg
        configs/android-4.14/android-base-arm64.cfg
        arch/arm64/configs/hikey_defconfig

Change-Id: Iee85d86d00b8740130fddc46117f156554984b0d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-01-24 15:10:02 -08:00
Steve Muckle
e446c5c1ab remove CONFIG_FB requirement am: 92e529f313 am: ec44bff68a
am: ded6b937c7

Change-Id: I425016b48a0927e8dc0da8f35a21b6156fbb85b0
2018-01-23 02:43:11 +00:00
Steve Muckle
ded6b937c7 remove CONFIG_FB requirement am: 92e529f313
am: ec44bff68a

Change-Id: Ib1bfeff56b536706a41b800c89f8bcfcf77a03d3
2018-01-23 02:28:36 +00:00
Steve Muckle
ec44bff68a remove CONFIG_FB requirement
am: 92e529f313

Change-Id: I8e33db1008052efc9851422b582a6b69bc77af57
2018-01-23 02:17:56 +00:00
Steve Muckle
92e529f313 remove CONFIG_FB requirement
CONFIG_FB is not strictly required by Android.

Bug: 70922431
Test: run vts-kernel -m VtsKernelConfig
Change-Id: I7152cc43669dea987754ad7398ec2277d29f33ec
2018-01-22 15:37:54 -08:00
Jerry Zhang
62b1c76eff Move CONFIG_AIO to android-base. am: 4ed084e489 am: 9e1494765c
am: 06d0443cc4

Change-Id: Ia74b6d3c259926cad8f5f37a3b03b77c70407f07
2018-01-10 19:58:58 +00:00
Jerry Zhang
06d0443cc4 Move CONFIG_AIO to android-base. am: 4ed084e489
am: 9e1494765c

Change-Id: If7e20bcf544992d01921005288b66324e8be46ec
2018-01-10 19:46:40 +00:00
Jerry Zhang
9e1494765c Move CONFIG_AIO to android-base.
am: 4ed084e489

Change-Id: I95a29562c0ab66329e11becef8ba13cbee91cfc7
2018-01-10 19:42:38 +00:00
Jerry Zhang
4ed084e489 Move CONFIG_AIO to android-base.
CONFIG_AIO has legitimate use for the functionfs
driver, which is used with adb and mtp. It is now
required to be enabled for better performance
with those services.

Bug: 37916658
Test: None
Change-Id: Ic9adb3340f6b3230798653e0bb08bbafdd550efd
Signed-off-by: Jerry Zhang <zhangjerry@google.com>
2018-01-10 18:37:54 +00:00
Suren Baghdasaryan
937930a0d2 remove CONFIG_ANDROID_LOW_MEMORY_KILLER requirement am: e8f5f841b7 am: ea412e8465
am: e64d8c2226

Change-Id: I4452aa7623d2584fc238926b05b59e1bebe8390e
2018-01-05 00:39:35 +00:00
Suren Baghdasaryan
e64d8c2226 remove CONFIG_ANDROID_LOW_MEMORY_KILLER requirement am: e8f5f841b7
am: ea412e8465

Change-Id: Ida77dc9e546c5eae7e24ba3b18b8df9d6d8dbd29
2018-01-05 00:36:01 +00:00
Suren Baghdasaryan
ea412e8465 remove CONFIG_ANDROID_LOW_MEMORY_KILLER requirement
am: e8f5f841b7

Change-Id: I844ee83137edc15b54b97dc087bc4cfdd753261d
2018-01-05 00:31:59 +00:00
Suren Baghdasaryan
e8f5f841b7 remove CONFIG_ANDROID_LOW_MEMORY_KILLER requirement
Kernel configuration options should include either
CONFIG_ANDROID_LOW_MEMORY_KILLER for in-kernel lowmemorykiller driver
to be used or a combination of CONFIG_MEMCG and CONFIG_MEMCG_SWAP
if userspace lmkd is preferred. It is not currently possible to express
this logical requirement in the config fragment so the
CONFIG_ANDROID_LOW_MEMORY_KILLER requirement is simply
removed for now.

Bug: 71502948

Change-Id: If022e978265465e7de75e23ac90361149398df3b
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2018-01-04 15:16:52 -08:00
Steve Muckle
48cefef06b move CONFIG_RANDOMIZE_BASE to recommended am: 297de70025 am: 73ab4a29be
am: b8d8c18398

Change-Id: Ibd69430814867a56647fd0f1121c6a2e2f5fb6c9
2017-11-28 22:36:09 +00:00
Steve Muckle
b8d8c18398 move CONFIG_RANDOMIZE_BASE to recommended am: 297de70025
am: 73ab4a29be

Change-Id: Ifdd7b9e9abe194d58cddc93e566e8531c6310843
2017-11-28 22:32:39 +00:00
Steve Muckle
73ab4a29be move CONFIG_RANDOMIZE_BASE to recommended
am: 297de70025

Change-Id: Icc683dc6ee7534ae139667a517ba184fa2926f5d
2017-11-28 22:26:38 +00:00
Steve Muckle
297de70025 move CONFIG_RANDOMIZE_BASE to recommended
CONFIG_RANDOMIZE_BASE is not strictly required by Android.

Bug: 69368848
Test: run vts-kernel -m VtsKernelConfig
Change-Id: Ibc68339c453e10a7d0fec9aa29a694effa45904a
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-11-28 11:18:23 -08:00
Xin Li
61955c7812 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 384c195d07

Change-Id: Ie476e4077ed1170ca2e2d6f1f64bef1786d01147
2017-11-15 01:37:15 +00:00
Xin Li
384c195d07 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I1fae65ad98fd9529087de78b4e421646bba18b43
2017-11-14 16:38:21 -08:00
Xin Li
c932ff00fe Merge commit 'ce3280cbe7a365e7d5bf9b07e1834cd8849c847a' into HEAD
Change-Id: I3f8537e81381d88e3d22633a2296c7abb8febe26
2017-11-13 14:35:41 -08:00
Steve Muckle
173d304a0e move CONFIG_RANDOMIZE_BASE out of global base config am: fb1cfddf81 am: 22a102865c
am: f6e5990711

Change-Id: Ie818c97e179faabec000e229a778b72957a4c2d3
2017-11-13 19:34:57 +00:00
Steve Muckle
2435919a92 add CONFIG_SECCOMP_FILTER=y to android-base.cfg am: faa8aca29e am: 27e6482ef6
am: 8ab2e495f4

Change-Id: Id868b3c9ace1edfc4f9891a596b50c91ff1df5c2
2017-11-13 19:34:12 +00:00
Steve Muckle
f6e5990711 move CONFIG_RANDOMIZE_BASE out of global base config am: fb1cfddf81
am: 22a102865c

Change-Id: I3367b6f1a78641e004c0dec32615ff1e39fd1d6f
2017-11-10 22:56:04 +00:00
Steve Muckle
8ab2e495f4 add CONFIG_SECCOMP_FILTER=y to android-base.cfg am: faa8aca29e
am: 27e6482ef6

Change-Id: I365402091e8e447b66bbd8c4319ab5a8b99ab05f
2017-11-10 22:55:52 +00:00
Steve Muckle
22a102865c move CONFIG_RANDOMIZE_BASE out of global base config
am: fb1cfddf81

Change-Id: Id326807d1d34da0d33f60e94d63ef74245d72d06
2017-11-10 22:54:17 +00:00
Steve Muckle
27e6482ef6 add CONFIG_SECCOMP_FILTER=y to android-base.cfg
am: faa8aca29e

Change-Id: I1563615cec16e137098776c9e88cc4c5a883b0c1
2017-11-10 22:54:00 +00:00
Steve Muckle
fb1cfddf81 move CONFIG_RANDOMIZE_BASE out of global base config
CONFIG_RANDOMIZE_BASE is not available for CONFIG_ARM platforms. Move it
to the base config for arm64 and x86 instead.

Bug: 69167010
Test: run vts-kernel -m VtsKernelConfig
Change-Id: Ia130666e0fb886b01754424658579ab7623ed09f
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-11-10 12:04:50 -08:00
Steve Muckle
7b780717fa add CONFIG_SDCARD_FS to recommended am: ea1dab85ac am: 76ec18565b
am: 2f4f1452c6

Change-Id: Iadd0271fed51cbecb5e0753a0295cb1193bf1219
2017-11-09 22:30:33 +00:00
Steve Muckle
faa8aca29e add CONFIG_SECCOMP_FILTER=y to android-base.cfg
Bug: 68154495
Test: run vts-kernel -m VtsKernelConfig
Change-Id: I0e77ec56b1b40d7016fec97772f735b5138bc63d
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-11-09 14:17:34 -08:00
Steve Muckle
2f4f1452c6 add CONFIG_SDCARD_FS to recommended am: ea1dab85ac
am: 76ec18565b

Change-Id: I2dc01b5d636171751a7dc7ab00a2a2ef8001560d
2017-11-09 22:08:41 +00:00
Steve Muckle
76ec18565b add CONFIG_SDCARD_FS to recommended
am: ea1dab85ac

Change-Id: I0fda1df451797374826f7c5d0ef52421d621399d
2017-11-09 22:03:11 +00:00
Steve Muckle
ea1dab85ac add CONFIG_SDCARD_FS to recommended
Bug: 68488621
Change-Id: Icb06460ae04855f7063e62cb08b7661ea99ad39a
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-11-09 11:15:41 -08:00
Chenbo Feng
e61eba83c9 Add eBPF syscall requirement to android-4.9 am: e56c1da97d am: 78c6624d4a
am: da9124c2b7

Change-Id: Ie29ab5224ab6567095d3b8d6ca92156f77fe949f
2017-11-07 08:39:50 +00:00
Chenbo Feng
da9124c2b7 Add eBPF syscall requirement to android-4.9 am: e56c1da97d
am: 78c6624d4a

Change-Id: I2604b9cbb96119ba3f43fa7cb6a77d60fc4f0a92
2017-11-07 08:36:50 +00:00
Chenbo Feng
78c6624d4a Add eBPF syscall requirement to android-4.9
am: e56c1da97d

Change-Id: I3de4d9451911cce41b7cdf84a8faeddc0d1401ba
2017-11-07 08:34:20 +00:00
Chenbo Feng
e56c1da97d Add eBPF syscall requirement to android-4.9
eBPF syscall is required for android-4.9 kernel since the new network
monitoring tool and cgroup bpf tool will be depend on it.

Bug: 30950746
Bug: 36510518
Test: bpf_test.py in kernel/test/net/test/ pass
Change-Id: I8ad11e1ee80c568d38f3d022959b28040c07bf03
Signed-off-by: Chenbo Feng <fengc@google.com>
2017-11-07 02:14:03 +00:00
Steve Muckle
5c8c4ee3d9 remove CONFIG_PM_AUTOSLEEP from android-base.cfg am: 6e30a9a158 am: 393cac1ab8 am: c3c2df4694
am: ce3280cbe7

Change-Id: If9c6f5efdf5d1c6685d705c51c91385317d84215
2017-10-04 21:04:58 +00:00
Steve Muckle
ce3280cbe7 remove CONFIG_PM_AUTOSLEEP from android-base.cfg am: 6e30a9a158 am: 393cac1ab8
am: c3c2df4694

Change-Id: Idab7cd9e4bc828562f64f3479f77e34f8b69c35d
2017-10-04 21:00:59 +00:00
Steve Muckle
c3c2df4694 remove CONFIG_PM_AUTOSLEEP from android-base.cfg am: 6e30a9a158
am: 393cac1ab8

Change-Id: Id80dbc456e08bb834b935babeb96413569115163
2017-10-04 20:44:55 +00:00
Steve Muckle
393cac1ab8 remove CONFIG_PM_AUTOSLEEP from android-base.cfg
am: 6e30a9a158

Change-Id: Ic3ab7e66aee33328d41d572ec0aeb6b5c79283b3
2017-10-04 20:32:59 +00:00
Steve Muckle
6e30a9a158 remove CONFIG_PM_AUTOSLEEP from android-base.cfg
Autosleep is no longer used by Android.

Bug: 63593926
Change-Id: I48956abea0c126f023880154ff445acf78682bde
Signed-off-by: Steve Muckle <smuckle@google.com>
2017-10-03 14:44:07 -07:00
Steve Muckle
1d556e2d4c add recommended configs and README.md file am: 649be155f9 am: 1a1cab16da am: c992cecdfc
am: 059ca1589c

Change-Id: Iee95161cfa89fff6fb9f2576ed0f7d285923e2b1
2017-09-15 19:02:14 +00:00
Steve Muckle
059ca1589c add recommended configs and README.md file am: 649be155f9 am: 1a1cab16da
am: c992cecdfc

Change-Id: If9b036497fefad779f5633a822ed5ecff16ea335
2017-09-15 18:59:42 +00:00
Steve Muckle
c992cecdfc add recommended configs and README.md file am: 649be155f9
am: 1a1cab16da

Change-Id: I4f7e65899f87c703cde65a1b98f661e45ad65407
2017-09-15 18:56:42 +00:00
Steve Muckle
1a1cab16da add recommended configs and README.md file
am: 649be155f9

Change-Id: I5b4de5506e9ce55d465ee29c40da052e1dd5fc2e
2017-09-15 18:54:12 +00:00
Steve Muckle
4fe894f4c7 require CONFIG_IP6_NF_MATCH_RPFILTER=y in 3.18, 4.4, 4.9 am: 8972acd5b6 am: 8ef671e85d am: a15c176a8a
am: 36784bac45

Change-Id: Id935b5e2037c9f31dd4f3f070adc2dbcbc9b0ff1
2017-09-14 01:14:48 +00:00
Steve Muckle
36784bac45 require CONFIG_IP6_NF_MATCH_RPFILTER=y in 3.18, 4.4, 4.9 am: 8972acd5b6 am: 8ef671e85d
am: a15c176a8a

Change-Id: Ia4c48071e7b3ec46766670f445bd9bcf58ba947d
2017-09-14 01:01:52 +00:00