Merge "defconfig: msm: Enable earlydomain handoff support"

This commit is contained in:
Linux Build Service Account 2018-12-06 18:46:15 -08:00 committed by Gerrit - the friendly Code Review server
commit 6c2461eeff
2 changed files with 8 additions and 5 deletions

View file

@ -1645,11 +1645,6 @@
/ {
reserved-memory {
lk_mem: lk_pool@0x91600000 {
reg = <0 0x91600000 0 0x00600000>;
label = "lk_pool";
};
early_camera_mem: early_camera_mem@b3fff000 {
reg = <0 0xb3fff000 0 0x800000>;
label = "early_camera_mem";
@ -1678,3 +1673,10 @@
&pil_modem {
/delete-property/qcom,ahb-clk-vote;
};
&soc {
early_domain: early_domain {
compatible = "qcom,early_domain";
status = "disabled";
};
};

View file

@ -555,6 +555,7 @@ CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y
CONFIG_MSM_GLINK_PKT=y
CONFIG_MSM_SPM=y
CONFIG_MSM_L2_SPM=y
CONFIG_QCOM_EARLY_DOMAIN=y
CONFIG_QCOM_SCM_XPU=y
CONFIG_QCOM_WATCHDOG_V2=y
CONFIG_QCOM_MEMORY_DUMP_V2=y