summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill McVicker <willmcvicker@google.com>2021-11-17 10:57:14 -0800
committerWill McVicker <willmcvicker@google.com>2022-01-10 15:19:06 -0800
commit069c135489f42ea6a316435cdd57975f381cde06 (patch)
treefa7813d965dbdd28e591b5a37bc199bf1b9dca7d
parent76f45e495a5d1b1b076ffbe25c7a076fcce921e8 (diff)
downloadbroadcom-069c135489f42ea6a316435cdd57975f381cde06.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 under from there. * Update BUILD.bazel to support these changes as well. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I72ba9a23e7e204a6689f080095b4eb0c401e9709
-rw-r--r--BUILD.bazel10
-rw-r--r--Kbuild2
-rw-r--r--Makefile5
3 files changed, 14 insertions, 3 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index f43eaad..f7e9fe4 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -10,10 +10,20 @@ load("//build/kleaf:kernel.bzl", "kernel_module")
kernel_module(
name = "broadcom.slider",
+ srcs = glob([
+ "**/*.c",
+ "**/*.h",
+ "Kbuild",
+ ]) + [
+ "//gs/kernel/device-modules:gs101_soc_headers",
+ ],
outs = [
"nitrous.ko",
],
kernel_build = "//gs/kernel/device-modules:slider",
+ kernel_module_deps = [
+ "//gs/kernel/device-modules:gs101_soc",
+ ],
visibility = [
"//gs/kernel/device-modules:__pkg__",
],
diff --git a/Kbuild b/Kbuild
index 3f61ad5..105c58f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,3 +1 @@
obj-$(CONFIG_NITROUS) := nitrous.o
-
-ccflags-y += -I$(abspath $(KERNEL_SRC)/$(M))
diff --git a/Makefile b/Makefile
index 5a16e0f..ef805c8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,8 @@ M ?= $(shell pwd)
KBUILD_OPTIONS := CONFIG_NITROUS=m
+include $(KERNEL_SRC)/../gs/kernel/device-modules/Makefile.include
+
modules modules_install clean:
- $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 $(KBUILD_OPTIONS) $(@)
+ $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 \
+ $(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@)