Merge "qcom bsp: Update msm8916 to use new qcom kernel" into mnc-brillo-dev

2 files changed, 30 insertions, 2 deletions

diff --git a/soc/msm8916/soc.kconf b/soc/msm8916/soc.kconf
new file mode 100644
index 0000000..fab7690
--- /dev/null
+++ b/soc/msm8916/soc.kconf
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
+CONFIG_SERIAL_MSM_HS=y
+CONFIG_SERIAL_MSM_HSL=y
+CONFIG_SERIAL_MSM_HSL_CONSOLE=y
+
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+
+CONFIG_KEXEC=y
diff --git a/soc/msm8916/soc.mk b/soc/msm8916/soc.mk
index 8afd699..9ba524e 100644
--- a/soc/msm8916/soc.mk
+++ b/soc/msm8916/soc.mk
@@ -45,8 +45,9 @@ BOARD_SEPOLICY_DIRS += \
 	$(LOCAL_PATH)/prebuilts/sepolicy \
 
 # Set up the local kernel.
-TARGET_KERNEL_SRC := hardware/bsp/kernel/qcom/android-msm-3.10
-TARGET_KERNEL_DEFCONFIG := dragonboard_defconfig
+TARGET_KERNEL_SRC := hardware/bsp/kernel/qcom/qcom-msm-3.10
+TARGET_KERNEL_DEFCONFIG := msm8916-perf_defconfig
+TARGET_KERNEL_CONFIGS := $(realpath $(LOCAL_PATH)/soc.kconf)
 
 # Include prebuilts to detect audio devices.
 PRODUCT_COPY_FILES += \