diff options
| author | Will McVicker <willmcvicker@google.com> | 2022-05-25 10:06:42 -0700 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2022-05-25 10:06:46 -0700 |
| commit | 3e7b594f3523be90cf3add45f5283aa6a1a17cda (patch) | |
| tree | cd30c6864e73639ae0bd7dca863616cba3695b11 | |
| parent | f0f54c02834c5515014659794cbb13dd8ad331d4 (diff) | |
| parent | 123177cbcfe03c3f57cf7fb9472a5c68e3dec851 (diff) | |
| download | reset-3e7b594f3523be90cf3add45f5283aa6a1a17cda.tar.gz | |
Merge 'aosp/android13-gs-raviole-5.15' into 'partner/android13-gs-pixel-5.15'
* partner/mirror-aosp-android13-gs-raviole-5.15:
kleaf: //build/kleaf -> //build/kernel/kleaf.
Update path for the SoC project
Update to support gs/kernel/device-modules as an external module
kleaf: Fix module paths for slider.
power: reset: add in_panic for swreset
power: reset: support emergency_restart swreset
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I708b37b7e49d74f151e8154096e2618da7c557a7
| -rw-r--r-- | BUILD.bazel | 12 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | exynos-reboot.c | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index b15a433..3da6d4a 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -6,7 +6,7 @@ # unless you have coordinated with the team managing the Soong to Bazel # migration. -load("//build/kleaf:kernel.bzl", "kernel_module") +load("//build/kernel/kleaf:kernel.bzl", "kernel_module") kernel_module( name = "reset.slider", @@ -15,16 +15,18 @@ kernel_module( "**/*.h", "Kbuild", ]) + [ - "//private/google-modules/bms:headers", + "//gs/google-modules/bms:headers", + "//gs/google-modules/soc-modules:gs101_soc_headers", ], outs = [ "exynos-reboot.ko", ], - kernel_build = "//private/gs-google:slider", + kernel_build = "//gs/google-modules/soc-modules:slider", kernel_module_deps = [ - "//private/google-modules/bms:bms.slider", + "//gs/google-modules/bms:bms.slider", + "//gs/google-modules/soc-modules:gs101_soc", ], visibility = [ - "//private/gs-google:__pkg__", + "//gs/google-modules/soc-modules:__pkg__", ], ) @@ -3,5 +3,10 @@ M ?= $(shell pwd) KBUILD_OPTIONS += CONFIG_POWER_RESET_EXYNOS=m +EXTRA_SYMBOLS += $(OUT_DIR)/../gs/google-modules/bms/Module.symvers + +include $(KERNEL_SRC)/../gs/google-modules/soc-modules/Makefile.include + modules modules_install clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) $(KBUILD_OPTIONS) KBUILD_EXTRA_SYMBOLS=$(OUT_DIR)/../google-modules/bms/Module.symvers $(@) + $(MAKE) -C $(KERNEL_SRC) M=$(M) \ + $(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@) diff --git a/exynos-reboot.c b/exynos-reboot.c index 0987750..c834c28 100644 --- a/exynos-reboot.c +++ b/exynos-reboot.c @@ -188,7 +188,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod pr_emerg("%s: Exynos SoC reset right now\n", __func__); if (s2mpg10_get_rev_id() == S2MPG10_EVT0 || - !rsbm_supported || + !rsbm_supported || !dbg_snapshot_get_reboot_status() || dbg_snapshot_get_panic_status()) { set_priv_reg(pmu_alive_base + warm_reboot_offset, warm_reboot_trigger); } else { |