diff options
| author | Android Partner Docs <noreply@android.com> | 2017-09-19 08:34:42 -0700 |
|---|---|---|
| committer | Clay Murphy <claym@google.com> | 2017-09-19 09:55:05 -0700 |
| commit | 14b812d43e4255403866454cfa0c88c9a47f89e1 (patch) | |
| tree | 4f3a3c32a5cda28b96c94acad8cd4b916c9d568d /en/devices/architecture | |
| parent | 5ef6ffc3032feb73abd49c8e300c8d5eae230aea (diff) | |
| download | source.android.com-14b812d43e4255403866454cfa0c88c9a47f89e1.tar.gz | |
Docs: Changes to source.android.com
- 169245210 fix typo by Android Partner Docs <noreply@android.com>
- 169160467 Updating figure text, general edits, fixing lists, image ... by hvm <hvm@google.com>
- 169134814 Add China, BT, and Sept security bulletin to home, modify... by claym <claym@google.com>
- 169126259 Enable continuous localization for SAC by daroberts <daroberts@google.com>
- 168902458 Updating kernel configs by hvm <hvm@google.com>
- 168902424 New images for gatekeeper and keystore, minor gatekeeper ... by hvm <hvm@google.com>
- 168881647 Updating images, edits for flow by hvm <hvm@google.com>
PiperOrigin-RevId: 169245210
Change-Id: Ia8ac09ae33b7818236348465ca09dd9a02d166a5
Diffstat (limited to 'en/devices/architecture')
| -rw-r--r-- | en/devices/architecture/kernel/config.html | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/en/devices/architecture/kernel/config.html b/en/devices/architecture/kernel/config.html index 14d2ee17..afc36f82 100644 --- a/en/devices/architecture/kernel/config.html +++ b/en/devices/architecture/kernel/config.html @@ -22,27 +22,28 @@ --> - <p>Use the following configuration settings as a base for an Android kernel -configuration. Settings are organized into <code>android-base</code> and -<code>android-recommended</code> .cfg files: +configuration. Settings are organized into <code>android-base</code>, +<code>android-base-<arch></code>, and <code>android-recommended</code> +.cfg files:</p> <ul> <li><code>android-base</code>. These options enable core Android features and -should be enabled by all devices.</li> - +should be configured as specified by all devices.</li> +<li><code>android-base-<arch></code>. These options enable core Android +features and should be configured as specified by all devices of architecture +<arch>. Not all architectures have a corresponding file of +architecture-specific required options. If your architecture does not have a +file, it does not have any additional architecture-specific kernel configuration +requirements for Android.</li> <li><code>android-recommended</code>. These options enable advanced Android features and are optional for devices.</li> </ul> -<p>Both the android-base.cfg and android-recommended.cfg files are located in -the android-common kernel repo at -<a href="https://android.googlesource.com/kernel/common/">https://android.googlesource.com/kernel/common/</a>. -<p>In version 4.8 of the upstream Linux kernel, a new location (kernel/configs) -was designated for kernel configuration fragments. The android base and -recommended config fragments are located in that directory for branches based on -4.8 or later. For kernel branches based on releases prior to 4.8, the config -fragments are located in the android/ directory.</p> +<p>These configuration files are located in the +<code><a href="https://android.googlesource.com/kernel/configs/">kernel/configs</a></code> +repo. Use the set of configuration files that corresponds to the version of the +kernel you are using.</p> <p>For details on controls already undertaken to strengthen the kernel on your devices, see <a href="/security/overview/kernel-security.html">System @@ -51,15 +52,15 @@ and Kernel Security</a>. For details on required settings, see the Document (CDD)</a>.</p> <h2 id="generating">Generating kernel config</h2> -<p>For devices that have a minimalist defconfig, you can use the following to -enable options:</p> +<p>For devices that have a minimalist defconfig, you can use the +<code>merge_config.sh</code> script in the kernel tree to enable options:</p> <pre class="devsite-click-to-copy"> -ARCH=<em>arch</em> scripts/kconfig/merge_config.sh <em>path</em>/<em>device</em>_defconfig android/configs/android-base.cfg android/configs/android-recommended.cfg +ARCH=<arch> scripts/kconfig/merge_config.sh <...>/device_defconfig <...>/android-base.cfg <...>/android-base-<arch>.cfg <...>/android-recommended.cfg </pre> -<p>This generates a .config file you can use to save a new defconfig or -compile a new kernel with Android features enabled.</p> +<p>This generates a <code>.config</code> file you can use to save a new +defconfig or compile a new kernel with Android features enabled.</p> <h2 id="usb">Enabling USB host mode options</h2> |