diff options
| author | Andrei Ciubotariu <aciubotariu@google.com> | 2022-12-18 01:52:07 +0000 |
|---|---|---|
| committer | Andrei Ciubotariu <aciubotariu@google.com> | 2022-12-18 01:52:07 +0000 |
| commit | 14bcc7c915b55247dab696f67da262eb57d39515 (patch) | |
| tree | 1cf351d4fb3c27e8d3d76510af09180aa68b924b | |
| parent | bb0ae27d9436ba4fa889df3ce2b5638e2edd25f2 (diff) | |
| parent | 53824aadd5219f081d0bf6bd4a99c3c8aa6e5953 (diff) | |
| download | data-kernel-14bcc7c915b55247dab696f67da262eb57d39515.tar.gz | |
Merge AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.017 into android13-msm-pixelwatch-5.15
This updates our sources to CodeLinaro release
AU_LINUX_ANDROID_LW.UM.2.1.R1.11.00.00.200.017 (LW.UM.2.1.r1-01700-SW5100.0),
which corresponds to ChipCode LW 2.0 r00019.1.
Bug: 262997652
Change-Id: I71d0aeaa8f584f4d682af297805f73efdccf3d56
Signed-off-by: Andrei Ciubotariu <aciubotariu@google.com>
| -rw-r--r-- | core/Android.mk | 7 | ||||
| -rw-r--r-- | core/Kbuild | 4 | ||||
| -rw-r--r-- | core/dfc.h | 2 | ||||
| -rw-r--r-- | core/wda.h | 2 | ||||
| -rw-r--r-- | datarmnet_dlkm_vendor_board.mk | 1 |
5 files changed, 10 insertions, 6 deletions
diff --git a/core/Android.mk b/core/Android.mk index b21316f..e1d6498 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -4,18 +4,21 @@ RMNET_CORE_DLKM_PLATFORMS_LIST += taro RMNET_CORE_DLKM_PLATFORMS_LIST += sa2150p RMNET_CORE_DLKM_PLATFORMS_LIST += kalama RMNET_CORE_DLKM_PLATFORMS_LIST += bengal +RMNET_CORE_DLKM_PLATFORMS_LIST += monaco ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true) #Make file to create RMNET_CORE DLKM LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +$(BOARD_COMMON_DIR) ?= device/qcom/common + LOCAL_CFLAGS := -Wno-macro-redefined -Wno-unused-function -Wall -Werror LOCAL_CLANG :=true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_MODULE := rmnet_core.ko LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*) -DLKM_DIR := $(TOP)/device/qcom/common/dlkm +DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm $(warning $(DLKM_DIR)) include $(DLKM_DIR)/Build_external_kernelmodule.mk @@ -27,7 +30,7 @@ LOCAL_CLANG :=true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_MODULE := rmnet_ctl.ko LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/**/*) $(wildcard $(LOCAL_PATH)/*) -DLKM_DIR := $(TOP)/device/qcom/common/dlkm +DLKM_DIR := $(TOP)/$(BOARD_COMMON_DIR)/dlkm $(warning $(DLKM_DIR)) include $(DLKM_DIR)/Build_external_kernelmodule.mk diff --git a/core/Kbuild b/core/Kbuild index 951064f..2bfa414 100644 --- a/core/Kbuild +++ b/core/Kbuild @@ -1,4 +1,4 @@ -ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE))) +ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE) $(CONFIG_ARCH_MONACO))) ccflags-y += -DRMNET_LA_PLATFORM endif @@ -32,7 +32,7 @@ rmnet_core-y += \ rmnet_qmap.o \ rmnet_ll_qmap.o -ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE))) +ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE) $(CONFIG_ARCH_MONACO))) obj-m += rmnet_ctl.o rmnet_ctl-y := \ rmnet_ctl_client.o \ @@ -19,7 +19,7 @@ #ifdef CONFIG_ARCH_KHAJE #define TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core #else - #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core + #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/monaco/datarmnet/core #endif #elif defined(__arch_um__) #define TRACE_INCLUDE_PATH ../../datarmnet/core @@ -11,7 +11,7 @@ #ifdef CONFIG_ARCH_KHAJE #define TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core #else - #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core + #define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/monaco/datarmnet/core #endif #elif defined(__arch_um__) #define TRACE_INCLUDE_PATH ../../datarmnet/core diff --git a/datarmnet_dlkm_vendor_board.mk b/datarmnet_dlkm_vendor_board.mk index 2c86159..90b2d13 100644 --- a/datarmnet_dlkm_vendor_board.mk +++ b/datarmnet_dlkm_vendor_board.mk @@ -15,6 +15,7 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true) DATA_DLKM_BOARD_PLATFORMS_LIST += sa2150p DATA_DLKM_BOARD_PLATFORMS_LIST += kalama DATA_DLKM_BOARD_PLATFORMS_LIST += bengal + DATA_DLKM_BOARD_PLATFORMS_LIST += monaco ifneq ($(TARGET_BOARD_AUTO),true) ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true) |