Fastforwarding datarmnet CRT:data-kernel.lnx.2.0-221103 to data-kernel.lnx.3.0 branch

core/Android.mk

@@ -3,6 +3,7 @@ RMNET_CORE_DLKM_PLATFORMS_LIST := lahaina
 RMNET_CORE_DLKM_PLATFORMS_LIST += taro
 RMNET_CORE_DLKM_PLATFORMS_LIST += sa2150p
 RMNET_CORE_DLKM_PLATFORMS_LIST += kalama
+RMNET_CORE_DLKM_PLATFORMS_LIST += bengal
 
 ifeq ($(call is-board-platform-in-list, $(RMNET_CORE_DLKM_PLATFORMS_LIST)),true)
 #Make file to create RMNET_CORE DLKM

core/Kbuild

@@ -1,4 +1,4 @@
-ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA)))
+ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE)))
 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)))
+ifneq (, $(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_WAIPIO) $(CONFIG_ARCH_KALAMA) $(CONFIG_ARCH_KHAJE)))
 obj-m += rmnet_ctl.o
 rmnet_ctl-y := \
 	rmnet_ctl_client.o \

core/dfc.h

@@ -16,7 +16,11 @@
 #undef TRACE_INCLUDE_PATH
 
 #if defined(RMNET_LA_PLATFORM)
-	#define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+	#ifdef CONFIG_ARCH_KHAJE
+		#define TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core
+	#else
+		#define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+	#endif
 #elif defined(__arch_um__)
 	#define TRACE_INCLUDE_PATH ../../datarmnet/core
 #elif defined(RMNET_TRACE_INCLUDE_LE)

core/wda.h

@@ -8,7 +8,11 @@
 #undef TRACE_INCLUDE_PATH
 
 #if defined(RMNET_LA_PLATFORM)
-	#define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+	#ifdef CONFIG_ARCH_KHAJE
+		#define TRACE_INCLUDE_PATH ../../../../../vendor/qcom/opensource/datarmnet/core
+	#else
+		#define TRACE_INCLUDE_PATH ../../../../vendor/qcom/opensource/datarmnet/core
+	#endif
 #elif defined(__arch_um__)
 	#define TRACE_INCLUDE_PATH ../../datarmnet/core
 #elif defined(RMNET_TRACE_INCLUDE_LE)

datarmnet_dlkm_vendor_board.mk

@@ -14,6 +14,7 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true)
 	DATA_DLKM_BOARD_PLATFORMS_LIST += taro
 	DATA_DLKM_BOARD_PLATFORMS_LIST += sa2150p
 	DATA_DLKM_BOARD_PLATFORMS_LIST += kalama
+	DATA_DLKM_BOARD_PLATFORMS_LIST += bengal
 
 	ifneq ($(TARGET_BOARD_AUTO),true)
 		ifeq ($(call is-board-platform-in-list,$(DATA_DLKM_BOARD_PLATFORMS_LIST)),true)
@@ -21,4 +22,4 @@ ifeq ($(TARGET_DATARMNET_ENABLE), true)
 			BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/rmnet_ctl.ko
 		endif
 	endif
-endif
+endif