summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2015-12-17 10:41:40 -0500
committerMike Frysinger <vapier@google.com>2015-12-18 16:40:30 -0500
commit1619c15ed18521eb31703703deae4e9336ecce01 (patch)
tree1acbe26d9528ed76a2f8b0115efe6194280b654e
parent3df1fc1de7af6f765db0bcb4e3782f526e21c8bc (diff)
downloadbrillo-1619c15ed18521eb31703703deae4e9336ecce01.tar.gz
brilloemulator: start common emu kernel config settings
There's some settings we want to enable across all emulators, so start a common config file for them. We don't have any options in there just yet -- that'll be in a follow up commit. Change-Id: I83e5d4533f9f20023cc0b39e11a453b6d8d10ac5
-rw-r--r--brilloemulator/CommonBoardConfig.mk3
-rw-r--r--brilloemulator/brillo.kconf18
2 files changed, 21 insertions, 0 deletions
diff --git a/brilloemulator/CommonBoardConfig.mk b/brilloemulator/CommonBoardConfig.mk
index 16e1b03..1e50117 100644
--- a/brilloemulator/CommonBoardConfig.mk
+++ b/brilloemulator/CommonBoardConfig.mk
@@ -30,3 +30,6 @@ USE_CLANG_PLATFORM_BUILD := true
PRODUCT_COPY_FILES += \
device/generic/brillo/brilloemulator/ueventd.rc:root/ueventd.qemu.rc \
+
+# Set up common kernel settings.
+$(call add_kernel_configs,$(realpath device/generic/brillo/brilloemulator/brillo.kconf))
diff --git a/brilloemulator/brillo.kconf b/brilloemulator/brillo.kconf
new file mode 100644
index 0000000..d20f50f
--- /dev/null
+++ b/brilloemulator/brillo.kconf
@@ -0,0 +1,18 @@
+#
+# Copyright 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Kernel settings that we want to enable for all emulators on all arches
+# are stored here.