From 14b812d43e4255403866454cfa0c88c9a47f89e1 Mon Sep 17 00:00:00 2001 From: Android Partner Docs Date: Tue, 19 Sep 2017 08:34:42 -0700 Subject: Docs: Changes to source.android.com - 169245210 fix typo by Android Partner Docs - 169160467 Updating figure text, general edits, fixing lists, image ... by hvm - 169134814 Add China, BT, and Sept security bulletin to home, modify... by claym - 169126259 Enable continuous localization for SAC by daroberts - 168902458 Updating kernel configs by hvm - 168902424 New images for gatekeeper and keystore, minor gatekeeper ... by hvm - 168881647 Updating images, edits for flow by hvm PiperOrigin-RevId: 169245210 Change-Id: Ia8ac09ae33b7818236348465ca09dd9a02d166a5 --- en/devices/architecture/kernel/config.html | 37 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 18 deletions(-) (limited to 'en/devices/architecture') 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 @@ --> -

Use the following configuration settings as a base for an Android kernel -configuration. Settings are organized into android-base and -android-recommended .cfg files: +configuration. Settings are organized into android-base, +android-base-<arch>, and android-recommended +.cfg files:

  • android-base. These options enable core Android features and -should be enabled by all devices.
    • - +should be configured as specified by all devices. +
  • android-base-<arch>. 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.
  • android-recommended. These options enable advanced Android features and are optional for devices.
-

Both the android-base.cfg and android-recommended.cfg files are located in -the android-common kernel repo at -https://android.googlesource.com/kernel/common/. -

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.

+

These configuration files are located in the +kernel/configs +repo. Use the set of configuration files that corresponds to the version of the +kernel you are using.

For details on controls already undertaken to strengthen the kernel on your devices, see System @@ -51,15 +52,15 @@ and Kernel Security. For details on required settings, see the Document (CDD).

Generating kernel config

-

For devices that have a minimalist defconfig, you can use the following to -enable options:

+

For devices that have a minimalist defconfig, you can use the +merge_config.sh script in the kernel tree to enable options:

-ARCH=arch scripts/kconfig/merge_config.sh path/device_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
-

This generates a .config file you can use to save a new defconfig or -compile a new kernel with Android features enabled.

+

This generates a .config file you can use to save a new +defconfig or compile a new kernel with Android features enabled.

Enabling USB host mode options

-- cgit v1.2.3