| commit | 3ef6518b095f657972caf284cc98c98f3c0ca27e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Feb 25 05:47:42 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 25 05:47:42 2019 -0800 |
| tree | be4756638f069cd99706b4918bb5da7229fe8cea | |
| parent | 93ee33a6bc622c9dc5f64e2615e02c9a31808cc2 [diff] | |
| parent | 9c1e14585fca9612927975a004a7268827ee0350 [diff] |
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 9c1e14585f -s ours am skip reason: subject contains skip directive Change-Id: I447204a19cb6a304f10b8faaf7b5bad112113658
When building the Linux kernel for a particular platform one usually begins by basing the kernel configuration off of a particular defconfig. The platform’s defconfig contains all of the Linux kconfig settings required to properly configure the kernel build (features, default system parameters, etc) for that platform. Defconfig files are typically stored in the kernel tree at arch/*/configs/.
It may be desirable to modify the kernel configuration beyond what the hardware platform requires in order to support a particular hardware or software feature. Storing these kernel configuration changes is often done using fragments. These are files which have the same format as a defconfig but are typically much smaller, as they only contain the kernel configuration settings needed to support the hardware or software feature/behavior in question. Maintainers of hardware extensions or software features can use fragments to compactly express their kernel requirements. The fragments can be combined with a platform defconfig using the kernel's make rules or using the scripts/kconfig/merge_config.sh script in the kernel tree.
The kernel configs are stored in the kernel/configs repo.
Kernel configuration settings that must be present for Android to function are located in the base config fragment, android-base.config. Configuration settings that enhance Android’s functionality in some way but are not required for it to run are located in the recommended config fragment, android-recommended.config.
Some kernel config requirements only apply on certain architectures. Other requirements only apply if some other kernel config option has a particular value. The platform owner may also have a choice between several config options. These types of constraints cannot be expressed with a simple kernel config fragment. In releases up to and including Android P, kernel config requirements that are specific to a particular architecture are contained in architecture-specific base config fragments, such as android-base-arm64.config. If an architecture-specific base config fragment does not exist for a particular architecture in Android P or an earlier release, it means there are no required kernel config options for Android specific to that architecture. Note that the architecture-agnostic kernel config requirements from android-base.config still apply in that case.
In releases after Android P the architecture-specific base config fragments are removed, and conditional kernel config requirements are stored in android-base-conditional.xml.
Kernel configs vary by kernel version, so there are sets of kernel configs for each version of the kernel that Android supports.
Assuming you already have a minimalist defconfig for your platform, a possible way to enable these options would be to use the aforementioned merge_config.sh script in the kernel tree. From the root of the kernel tree:
ARCH=<arch> scripts/kconfig/merge_config.sh <...>/<platform>_defconfig <...>/android-base.config <...>/android-base-<arch>.config <...>/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.
The kernel build system also supports merging in config fragments directly. The fragments must be located in the kernel/configs directory of the kernel tree and they must have filenames that end with the extension ".config". The platform defconfig must also be located in arch/<arch>/configs/. Once these requirements are satisfied, the full defconfig can be prepared with:
make ARCH=<arch> <platform>_defconfig android-base.config android-base-<arch>.config android-recommended.config
If there is an android-base-conditional.xml file for your release/kernel version combination, it is necessary to review it and manually edit your defconfig to satisfy any applicable requirements.
Starting with Android O the base kernel configs are not just advisory. They are tested as part of VTS (specifically the SystemVendorTest.KernelCompatibility subtest of CtsOnGsiTrebleFrameworkVintfTest), and also during device boot when the vendor interface (which includes the kernel configuration) and framework compatibility matrix are compared.
Devices launched with prior releases of Android must be able to upgrade to later releases of Android. This means that AOSP must function not only with device kernels that adhere to the Android kernel configs of the current release, but also with those device kernels that adhere to the configs of past releases. To facilitate that in the VtsKernelConfig test and in the framework compatibility matrix, past versions of the Android kernel config requirements are stored in the kernel/configs repo. During tests the appropriate versions of the configs are accessed depending on the launch level of the device.
If you are adding a new feature to AOSP which depends on a particular kernel configuration value, either that kernel configuration value must already be present in the base android config fragments of past releases still on the supported upgrade path, or the feature must be designed in a way to degrade gracefully when the required kernel configuration is not present (and not be essential to AOSP’s overall functionality). All configs on the supported upgrade path are in the kernel/configs repo.
Support for kernel configs from previous dessert releases is dropped from AOSP when the upgrade path from that dessert release is no longer supported.
The top level of the kernel configs repo contains directories for each supported kernel version. These contain the kernel config requirements (and recommendations) for the next release. There are also directories at the top level for previous releases. These directories contain the final kernel config requirements (for all supported kernel versions) for those releases and must not be changed once those releases have been published. AOSP must support all kernel configurations in this repo.
For release branches the structure is similar, except there are no configs at the top level. When a release is branched from master the top-level configs are copied into a new directory for the release (this change is propagated to master) and the top-level configs are removed (this change is not propagated to master) since no development beyond that release is done in that branch.
Modify the top level kernel configs in AOSP. Make sure to modify the configs for all applicable kernel versions. Do not modify the config fragments in release directories.
Because there is no tool to consistently generate these config fragments, please keep them alphabetically (not randomly) sorted.
android-x.y/android-base.configThis file lists all common kernel configuration requirements on kernel version x.y.
android-x.y/android-base-conditional.xmlContains the following:
android-x.y/Android.bpBuild rules from the aforementioned files to a framework compatibility matrix . See this link for details of the output format.
Prior to a FCM Version release (often accompanied with a dessert release as well), the kernel requirements must be frozen. Follow the following steps
android-* directories to a release directory, preferably with the dessert name (for example, q).android-* directories. This change is not propagated to master.<dessert>/android-*/Android.bp files and rename the modules. For example, change kernel_config_current_4.9 in q/android-4.9/Android.bp to kernel_config_q_4.9hardware/interfaces/compatibility_matrices/Android.bp, edit kernel_config field for the framework_compatibility_matrix.current.xml to use the new modules.framework_compatibility_matrix.current.xml will be renamed to framework_compatibility_matrix.<level>.xml as part of the FCM Version release, which is a separate process.Don't edit a released kernel requirement unless necessary. If you have to make such a change, after discussing the change with maintainers, keep in mind that you CANNOT make a requirement more restrictive. Specifically,
<dessert>/android-x.y directory<dessert>/android-*/android-base.config<dessert>/android-*/android-base-*.config<dessert>/android-*/android-base-conditional.xmlx.y.u to x.y.v (where v < u)<group><group><conditions><config><group><config><dessert>/android-*/android-base.config<dessert>/android-*/android-base-*.config<dessert>/android-*/android-base-*.config<dessert>/android-*/android-base-*.config<dessert>/android-*/android-base-conditional.xmlx.y.u to x.y.v (where v < u)<group><conditions><config><group><config>