summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill McVicker <willmcvicker@google.com>2021-11-17 11:00:32 -0800
committerWill McVicker <willmcvicker@google.com>2022-01-10 15:20:51 -0800
commit5a57d7228314ee8a84da01df300bc995491a8978 (patch)
treef7fc0da44a0f9dfc2ddb29db8d950b5e34518da8
parent4bee30a38c7fa6cacc55170ee1ca681dc263fd92 (diff)
downloadreset-5a57d7228314ee8a84da01df300bc995491a8978.tar.gz
Update to support gs/kernel/device-modules as an external module
* Include the Makefile.include from gs/kernel/device-modules which updates EXTRA_CFLAGS and EXTRA_SYMBOLS to be able to include headers from there as well as link against modules from there. * Update BUILD.bazel to support these changes as well. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: If3ca4c35d0c2106d9d0199bf2ce2472b5f361562
-rw-r--r--BUILD.bazel2
-rw-r--r--Makefile7
2 files changed, 8 insertions, 1 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index 324ed31..caf0029 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -16,6 +16,7 @@ kernel_module(
"Kbuild",
]) + [
"//gs/google-modules/bms:headers",
+ "//gs/kernel/device-modules:gs101_soc_headers",
],
outs = [
"exynos-reboot.ko",
@@ -23,6 +24,7 @@ kernel_module(
kernel_build = "//gs/kernel/device-modules:slider",
kernel_module_deps = [
"//gs/google-modules/bms:bms.slider",
+ "//gs/kernel/device-modules:gs101_soc",
],
visibility = [
"//gs/kernel/device-modules:__pkg__",
diff --git a/Makefile b/Makefile
index b848d6b..3f758e9 100644
--- a/Makefile
+++ b/Makefile
@@ -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/kernel/device-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)" $(@)