diff options
| author | Kees Cook <keescook@google.com> | 2016-05-15 11:05:23 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@google.com> | 2016-05-17 19:18:10 +0000 |
| commit | 7d421428a3aee9e2bfa52040ec337f95aa112dcc (patch) | |
| tree | 682edefe289b73cc8d3ac298e36ad7044ca8377e | |
| parent | 4684f18762040716b844894f5010e6f8994262cc (diff) | |
| download | brillo-7d421428a3aee9e2bfa52040ec337f95aa112dcc.tar.gz | |
kernel: make CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE optional
We have kernel images (picoimx) that do not want a legacy appended DTB,
so move this config to recommended so that it can be overridden by a
product kernel config fragment.
Bug: 28768869
Change-Id: Ife7c27636c2da520a15d430fb5aedf535cfe3d3f
| -rw-r--r-- | kconfig/arm.config | 3 | ||||
| -rw-r--r-- | kconfig/arm64.config | 3 | ||||
| -rw-r--r-- | kconfig/common.config | 5 | ||||
| -rw-r--r-- | kconfig/recommended.config | 8 |
4 files changed, 11 insertions, 8 deletions
diff --git a/kconfig/arm.config b/kconfig/arm.config index ba01b5f..01771a5 100644 --- a/kconfig/arm.config +++ b/kconfig/arm.config @@ -14,9 +14,6 @@ # limitations under the License. # -# Append DTB to image. -CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y - # Disallow allocating the first 32k of memory (cannot be 64k due to ARM loader). CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/kconfig/arm64.config b/kconfig/arm64.config index 12ba109..41b8ece 100644 --- a/kconfig/arm64.config +++ b/kconfig/arm64.config @@ -14,8 +14,5 @@ # limitations under the License. # -# Append DTB to image. -CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y - # Disallow allocating the first 32k of memory (cannot be 64k due to ARM loader). CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 diff --git a/kconfig/common.config b/kconfig/common.config index 618bd65..159326c 100644 --- a/kconfig/common.config +++ b/kconfig/common.config @@ -14,6 +14,11 @@ # limitations under the License. # +# +# The following are the Brillo kernel configurations that are required +# for all kernel builds. These cannot be overridden. +# + CONFIG_PM_AUTOSLEEP=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_RUNTIME=y diff --git a/kconfig/recommended.config b/kconfig/recommended.config index 11597ca..f564956 100644 --- a/kconfig/recommended.config +++ b/kconfig/recommended.config @@ -14,10 +14,14 @@ # limitations under the License. # -# This file contains the Brillo kernel configurations that are recommended -# (though not strictly required) for all kernel builds. +# The following are the Brillo kernel configurations that are recommended +# (though not strictly required) for all kernel builds. These can be +# overridden by setting TARGET_KERNEL_CONFIGS. # +# If building an old Android-patched kernel tree, append DTB to image. +CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y + # Building a monolithic kernel is highly recommended since it removes the # kernel module attack surface entirely. # CONFIG_MODULES is not set |