rmnet_core: Remove rmnet_ctl from compilation
Break dependency between rmnet_core and rmnet_ctl so that we can compile rmnet_core without rmnet_ctl on yocto based targets. Change-Id: I3bfa3dbcd24f9343d073107f40b6d98c77aba881 Signed-off-by: Conner Huff <chuff@codeaurora.org>
Dieser Commit ist enthalten in:

committet von
Gerrit - the friendly Code Review server

Ursprung
71d89a7197
Commit
d4342c871d
@@ -7,7 +7,6 @@ ccflags-y += -DRMNET_TRACE_INCLUDE_LE
|
||||
endif
|
||||
|
||||
obj-m += rmnet_core.o
|
||||
obj-m += rmnet_ctl.o
|
||||
|
||||
#core sources
|
||||
rmnet_core-y := \
|
||||
@@ -32,6 +31,9 @@ rmnet_core-y += \
|
||||
rmnet_qmap.o \
|
||||
rmnet_ll_qmap.o
|
||||
|
||||
ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO)))
|
||||
obj-m += rmnet_ctl.o
|
||||
rmnet_ctl-y := \
|
||||
rmnet_ctl_client.o \
|
||||
rmnet_ctl_ipa.o
|
||||
endif
|
||||
|
@@ -22,11 +22,17 @@ rmnet_core-y += rmnet_config.o \
|
||||
dfc_qmap.c \
|
||||
dfc_qmi.c \
|
||||
qmi_rmnet.0 \
|
||||
wda_qmi.0
|
||||
wda_qmi.0 \
|
||||
rmnet_ll.o \
|
||||
rmnet_ll_ipa.o \
|
||||
rmnet_qmap.o \
|
||||
rmnet_ll_qmap.o
|
||||
|
||||
ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO)))
|
||||
rmnet_ctl-y += rmnet_ctl_client.o \
|
||||
rmnet_ctl_ipa.o \
|
||||
rmnet_ctl_mhi.o
|
||||
endif
|
||||
|
||||
KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
|
||||
/* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
|
||||
*
|
||||
* RMNET_CTL header
|
||||
*
|
||||
@@ -29,6 +29,10 @@ struct rmnet_ctl_client_if {
|
||||
const void *data, unsigned int len);
|
||||
};
|
||||
|
||||
#ifdef RMNET_LA_PLATFORM
|
||||
struct rmnet_ctl_client_if *rmnet_ctl_if(void);
|
||||
#else
|
||||
inline struct rmnet_ctl_client_if *rmnet_ctl_if(void) {return NULL;};
|
||||
#endif /* RMNET_LA_PLATFORM */
|
||||
|
||||
#endif /* _RMNET_CTL_H_ */
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren