Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90b07b3f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sm8150: Enable USB RNDIS netwrok SW path"

parents f83e796e 64b36c60

arch/arm64/configs/vendor/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

arch/arm64/configs/vendor/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_VBUS_DRAW=900

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_RNDIS=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

drivers/usb/gadget/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ config USB_F_EEM 
config USB_F_SUBSET

	tristate



config USB_RNDIS

	tristate



config USB_F_RNDIS

	tristate
@@ -325,6 +328,7 @@ config USB_CONFIGFS_RNDIS 
	depends on USB_CONFIGFS

	depends on NET

	select USB_U_ETHER

	select USB_RNDIS

	select USB_F_RNDIS

	help

	   Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
@@ -584,6 +588,7 @@ config USB_CONFIGFS_F_CCID 
config USB_CONFIGFS_F_GSI

	bool "USB GSI function"

	select USB_F_GSI

	select USB_RNDIS

	depends on USB_CONFIGFS

	help

	  The GSI function supports the IPA Generic Software Interface found

drivers/usb/gadget/function/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_USB_F_SERIAL) += usb_f_serial.o 
usb_f_obex-y			:= f_obex.o

obj-$(CONFIG_USB_F_OBEX)	+= usb_f_obex.o

obj-$(CONFIG_USB_U_ETHER)	+= u_ether.o

obj-$(CONFIG_USB_RNDIS)		+= rndis.o

usb_f_ncm-y			:= f_ncm.o

obj-$(CONFIG_USB_F_NCM)		+= usb_f_ncm.o

usb_f_ecm-y			:= f_ecm.o
@@ -27,7 +28,7 @@ usb_f_eem-y := f_eem.o 
obj-$(CONFIG_USB_F_EEM)		+= usb_f_eem.o

usb_f_ecm_subset-y		:= f_subset.o

obj-$(CONFIG_USB_F_SUBSET)	+= usb_f_ecm_subset.o

usb_f_rndis-y			:= f_rndis.o rndis.o

usb_f_rndis-y			:= f_rndis.o

obj-$(CONFIG_USB_F_RNDIS)	+= usb_f_rndis.o

usb_f_mass_storage-y		:= f_mass_storage.o storage_common.o

obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
@@ -64,7 +65,7 @@ usb_f_cdev-y := f_cdev.o 
obj-$(CONFIG_USB_F_CDEV)	+= usb_f_cdev.o

usb_f_ccid-y			:= f_ccid.o

obj-$(CONFIG_USB_F_CCID)	+= usb_f_ccid.o

usb_f_gsi-y			:= f_gsi.o rndis.o

usb_f_gsi-y			:= f_gsi.o

obj-$(CONFIG_USB_F_GSI)		+= usb_f_gsi.o

usb_f_qdss-y			:= f_qdss.o u_qdss.o

obj-$(CONFIG_USB_F_QDSS)	+= usb_f_qdss.o