commit 9a25aee683e044ce574087c129fa59c369caed6d
author Jack Lee <liangjlee@google.com> Thu Dec 12 22:39:17 2024 -0800
committer Android Partner Code Review <android-gerrit-partner@google.com> Thu Dec 12 22:39:17 2024 -0800
tree a19581458ef040000dad5441ae178a687b486c35
parent f4c682bcd9e49e98b720f6180ebd1def8de33587
parent 6a10bcb050ce0bf9f72fbead856ac2ebe0b728fd

Merge "smra: Enable in zuma." into android14-gs-pixel-6.1

BUILD.bazel

diff --git a/BUILD.bazel b/BUILD.bazel
index 8ef065d..004fb22 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -205,6 +205,7 @@
         "drivers/soc/google/pt/slc_dummy.ko",
         "drivers/soc/google/pt/slc_pmon.ko",
         "drivers/soc/google/pt/slc_pt.ko",
+        "drivers/soc/google/smra/smra.ko",
         "drivers/soc/google/vh/kernel/cgroup/vh_cgroup.ko",
         "drivers/soc/google/vh/kernel/fs/vh_fs.ko",
         "drivers/soc/google/vh/kernel/metrics/pixel_metrics.ko",

zuma_defconfig

diff --git a/zuma_defconfig b/zuma_defconfig
index aa66c5d..806d9c2 100644
--- a/zuma_defconfig
+++ b/zuma_defconfig
@@ -175,6 +175,7 @@
 CONFIG_ETM2DRAM=m
 CONFIG_EXYNOS_GNSS_IF_SPI=m
 CONFIG_GCMA=m
+CONFIG_SMRA=m
 CONFIG_VH_SYSTRACE=m
 CONFIG_PIXEL_EM=m
 CONFIG_PIXEL_METRICS=m