aboutsummaryrefslogtreecommitdiff
path: root/en/devices/architecture/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'en/devices/architecture/kernel')
-rw-r--r--en/devices/architecture/kernel/config.html37
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-&lt;arch&gt;</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-&lt;arch&gt;</code>. These options enable core Android
+features and should be configured as specified by all devices of architecture
+&lt;arch&gt;. 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=&lt;arch&gt; scripts/kconfig/merge_config.sh <...>/device_defconfig <...>/android-base.cfg <...>/android-base-&lt;arch&gt;.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>