From 3b2c7f527054b1226dc3f72fd57f3872fc1c2cf8 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sun, 4 Aug 2019 02:24:12 +0000 Subject: [PATCH] techpack: Integrate Qualcomm data-kernel package This allows to build the rmnet_perf and rmnet_shs modules into the kernel easily. Signed-off-by: Danny Lin Change-Id: I205ec5517e6b1af87f7c3ca8c31a86fd98d715da --- Kconfig | 2 ++ techpack/Kconfig | 5 +++++ techpack/data/Kconfig | 1 + techpack/data/Makefile | 1 + techpack/data/drivers/Kconfig | 5 +++++ techpack/data/drivers/Makefile | 1 + techpack/data/drivers/rmnet/Kconfig | 2 ++ techpack/data/drivers/rmnet/Makefile | 2 ++ techpack/data/drivers/rmnet/perf/Kbuild | 2 +- techpack/data/drivers/rmnet/perf/Kconfig | 12 ++++++------ techpack/data/drivers/rmnet/shs/Kbuild | 2 +- techpack/data/drivers/rmnet/shs/Kconfig | 12 ++++++------ 12 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 techpack/Kconfig create mode 100644 techpack/data/Kconfig create mode 100644 techpack/data/Makefile create mode 100644 techpack/data/drivers/Kconfig create mode 100644 techpack/data/drivers/Makefile create mode 100644 techpack/data/drivers/rmnet/Kconfig create mode 100644 techpack/data/drivers/rmnet/Makefile diff --git a/Kconfig b/Kconfig index 8c4c1cb0f9cd..ccad72d22676 100644 --- a/Kconfig +++ b/Kconfig @@ -10,3 +10,5 @@ config SRCARCH option env="SRCARCH" source "arch/$SRCARCH/Kconfig" + +source "techpack/Kconfig" diff --git a/techpack/Kconfig b/techpack/Kconfig new file mode 100644 index 000000000000..b3c5013ad893 --- /dev/null +++ b/techpack/Kconfig @@ -0,0 +1,5 @@ +menu "Tech packages" + +source "techpack/data/Kconfig" + +endmenu diff --git a/techpack/data/Kconfig b/techpack/data/Kconfig new file mode 100644 index 000000000000..696071f9cd05 --- /dev/null +++ b/techpack/data/Kconfig @@ -0,0 +1 @@ +source "techpack/data/drivers/Kconfig" diff --git a/techpack/data/Makefile b/techpack/data/Makefile new file mode 100644 index 000000000000..1ff634d5a361 --- /dev/null +++ b/techpack/data/Makefile @@ -0,0 +1 @@ +obj-y += drivers/ diff --git a/techpack/data/drivers/Kconfig b/techpack/data/drivers/Kconfig new file mode 100644 index 000000000000..a45052c6bdc0 --- /dev/null +++ b/techpack/data/drivers/Kconfig @@ -0,0 +1,5 @@ +menu "RmNet extensions" + +source "techpack/data/drivers/rmnet/Kconfig" + +endmenu diff --git a/techpack/data/drivers/Makefile b/techpack/data/drivers/Makefile new file mode 100644 index 000000000000..7a2c7ff726fd --- /dev/null +++ b/techpack/data/drivers/Makefile @@ -0,0 +1 @@ +obj-y += rmnet/ diff --git a/techpack/data/drivers/rmnet/Kconfig b/techpack/data/drivers/rmnet/Kconfig new file mode 100644 index 000000000000..82b861ac06bd --- /dev/null +++ b/techpack/data/drivers/rmnet/Kconfig @@ -0,0 +1,2 @@ +source "techpack/data/drivers/rmnet/perf/Kconfig" +source "techpack/data/drivers/rmnet/shs/Kconfig" diff --git a/techpack/data/drivers/rmnet/Makefile b/techpack/data/drivers/rmnet/Makefile new file mode 100644 index 000000000000..82e56d0ab7c5 --- /dev/null +++ b/techpack/data/drivers/rmnet/Makefile @@ -0,0 +1,2 @@ +obj-y += perf/ +obj-y += shs/ diff --git a/techpack/data/drivers/rmnet/perf/Kbuild b/techpack/data/drivers/rmnet/perf/Kbuild index e3537c75ed67..71bae10b8c1c 100644 --- a/techpack/data/drivers/rmnet/perf/Kbuild +++ b/techpack/data/drivers/rmnet/perf/Kbuild @@ -1,3 +1,3 @@ -obj-m += rmnet_perf.o +obj-$(CONFIG_RMNET_PERF) += rmnet_perf.o rmnet_perf-y := rmnet_perf_config.o rmnet_perf_core.o rmnet_perf_opt.o \ rmnet_perf_tcp_opt.o rmnet_perf_udp_opt.o diff --git a/techpack/data/drivers/rmnet/perf/Kconfig b/techpack/data/drivers/rmnet/perf/Kconfig index e55d24e59668..f2af253aa93d 100644 --- a/techpack/data/drivers/rmnet/perf/Kconfig +++ b/techpack/data/drivers/rmnet/perf/Kconfig @@ -2,9 +2,9 @@ # RMNET_PERF driver # -menuconfig RMNET_PERF - tristate "Rmnet Perf driver" - default m -# depends on RMNET - ---help--- - performance mode of rmnet driver \ No newline at end of file +config RMNET_PERF + tristate "Rmnet Perf driver" + default m + depends on RMNET + ---help--- + performance mode of rmnet driver diff --git a/techpack/data/drivers/rmnet/shs/Kbuild b/techpack/data/drivers/rmnet/shs/Kbuild index 196d128a4a55..636848794a9c 100644 --- a/techpack/data/drivers/rmnet/shs/Kbuild +++ b/techpack/data/drivers/rmnet/shs/Kbuild @@ -1,2 +1,2 @@ -obj-m += rmnet_shs.o +obj-$(CONFIG_RMNET_SHS) += rmnet_shs.o rmnet_shs-y := rmnet_shs_config.o rmnet_shs_main.o rmnet_shs_wq.o rmnet_shs_freq.o rmnet_shs_wq_mem.o rmnet_shs_wq_genl.o diff --git a/techpack/data/drivers/rmnet/shs/Kconfig b/techpack/data/drivers/rmnet/shs/Kconfig index 52c401995bb3..b5c9199a4011 100644 --- a/techpack/data/drivers/rmnet/shs/Kconfig +++ b/techpack/data/drivers/rmnet/shs/Kconfig @@ -2,9 +2,9 @@ # RMNET_SHS driver # -menuconfig RMNET_SHS - tristate "Rmnet SHS driver" - default m -# depends on RMNET - ---help--- - performance mode of rmnet driver +config RMNET_SHS + tristate "Rmnet SHS driver" + default m + depends on RMNET + ---help--- + performance mode of rmnet driver