microchip: linux: merge config changes for usb gadget and imx219

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

04_build_linux.sh

@@ -105,25 +105,41 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
 	./scripts/config --enable CONFIG_SECURITY_PATH
 	./scripts/config --set-val CONFIG_LSM_MMAP_MIN_ADDR 65536
 
-	./scripts/config --disable CONFIG_SECURITY_SELINUX
-	./scripts/config --disable CONFIG_SECURITY_SMACK
-	./scripts/config --disable CONFIG_SECURITY_TOMOYO
-	./scripts/config --disable CONFIG_SECURITY_APPARMOR
-	./scripts/config --disable CONFIG_SECURITY_LOADPIN
-	./scripts/config --disable CONFIG_SECURITY_YAMA
-	./scripts/config --disable CONFIG_SECURITY_SAFESETID
-	./scripts/config --disable CONFIG_SECURITY_LOCKDOWN_LSM
-	./scripts/config --disable CONFIG_SECURITY_LANDLOCK
-
 	./scripts/config --enable CONFIG_INTEGRITY
-	./scripts/config --disable CONFIG_INTEGRITY_SIGNATURE
-
-	./scripts/config --disable CONFIG_IMA
-	./scripts/config --disable CONFIG_EVM
 
 	#./scripts/config --disable CONFIG_VMAP_STACK
 	#./scripts/config --disable CONFIG_SMP
 
+	./scripts/config --enable CONFIG_USB_MUSB_DUAL_ROLE
+
+	./scripts/config --enable CONFIG_USB_GADGET
+	./scripts/config --enable CONFIG_USB_CONFIGFS
+	./scripts/config --enable CONFIG_CONFIGFS_FS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_SERIAL
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ACM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_OBEX
+	./scripts/config --enable CONFIG_USB_CONFIGFS_NCM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM_SUBSET
+	./scripts/config --enable CONFIG_USB_CONFIGFS_RNDIS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_EEM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_PHONET
+	./scripts/config --enable CONFIG_USB_CONFIGFS_MASS_STORAGE
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_LB_SS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_FS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC1
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC2
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_MIDI
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_HID
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UVC
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_PRINTER
+
+	./scripts/config --module CONFIG_MEDIA_SUPPORT
+	./scripts/config --enable CONFIG_MEDIA_SUPPORT_FILTER
+	./scripts/config --enable CONFIG_MEDIA_SUBDRV_AUTOSELECT
+	./scripts/config --enable CONFIG_MEDIA_CAMERA_SUPPORT
+	./scripts/config --module CONFIG_VIDEO_IMX219
+
 	#Optimize:
 	./scripts/config --enable CONFIG_IP_NF_IPTABLES
 	./scripts/config --enable CONFIG_NETFILTER_XTABLES

build_linux_menuconfig.sh

@@ -105,25 +105,41 @@ if [ -f arch/riscv/configs/mpfs_defconfig ] ; then
 	./scripts/config --enable CONFIG_SECURITY_PATH
 	./scripts/config --set-val CONFIG_LSM_MMAP_MIN_ADDR 65536
 
-	./scripts/config --disable CONFIG_SECURITY_SELINUX
-	./scripts/config --disable CONFIG_SECURITY_SMACK
-	./scripts/config --disable CONFIG_SECURITY_TOMOYO
-	./scripts/config --disable CONFIG_SECURITY_APPARMOR
-	./scripts/config --disable CONFIG_SECURITY_LOADPIN
-	./scripts/config --disable CONFIG_SECURITY_YAMA
-	./scripts/config --disable CONFIG_SECURITY_SAFESETID
-	./scripts/config --disable CONFIG_SECURITY_LOCKDOWN_LSM
-	./scripts/config --disable CONFIG_SECURITY_LANDLOCK
-
 	./scripts/config --enable CONFIG_INTEGRITY
-	./scripts/config --disable CONFIG_INTEGRITY_SIGNATURE
-
-	./scripts/config --disable CONFIG_IMA
-	./scripts/config --disable CONFIG_EVM
 
 	#./scripts/config --disable CONFIG_VMAP_STACK
 	#./scripts/config --disable CONFIG_SMP
 
+	./scripts/config --enable CONFIG_USB_MUSB_DUAL_ROLE
+
+	./scripts/config --enable CONFIG_USB_GADGET
+	./scripts/config --enable CONFIG_USB_CONFIGFS
+	./scripts/config --enable CONFIG_CONFIGFS_FS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_SERIAL
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ACM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_OBEX
+	./scripts/config --enable CONFIG_USB_CONFIGFS_NCM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_ECM_SUBSET
+	./scripts/config --enable CONFIG_USB_CONFIGFS_RNDIS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_EEM
+	./scripts/config --enable CONFIG_USB_CONFIGFS_PHONET
+	./scripts/config --enable CONFIG_USB_CONFIGFS_MASS_STORAGE
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_LB_SS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_FS
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC1
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UAC2
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_MIDI
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_HID
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_UVC
+	./scripts/config --enable CONFIG_USB_CONFIGFS_F_PRINTER
+
+	./scripts/config --module CONFIG_MEDIA_SUPPORT
+	./scripts/config --enable CONFIG_MEDIA_SUPPORT_FILTER
+	./scripts/config --enable CONFIG_MEDIA_SUBDRV_AUTOSELECT
+	./scripts/config --enable CONFIG_MEDIA_CAMERA_SUPPORT
+	./scripts/config --module CONFIG_VIDEO_IMX219
+
 	#Optimize:
 	./scripts/config --enable CONFIG_IP_NF_IPTABLES
 	./scripts/config --enable CONFIG_NETFILTER_XTABLES

patches/linux/mpfs_defconfig

@@ -2413,8 +2413,11 @@ CONFIG_MEDIA_CONTROLLER=y
 # Video4Linux options
 #
 CONFIG_VIDEO_V4L2_I2C=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_V4L2_FWNODE=m
+CONFIG_V4L2_ASYNC=m
 # end of Video4Linux options
 
 #
@@ -2453,6 +2456,7 @@ CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
 CONFIG_VIDEOBUF2_MEMOPS=m
 CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
 # end of Media drivers
 
 #
@@ -2468,7 +2472,7 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 # CONFIG_VIDEO_HI847 is not set
 # CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
-# CONFIG_VIDEO_IMX219 is not set
+CONFIG_VIDEO_IMX219=m
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set
@@ -2894,7 +2898,9 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USBIP_CORE is not set
 # CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
-CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
 
 #
 # Platform Glue Layer
@@ -3008,7 +3014,89 @@ CONFIG_NOP_USB_XCEIV=y
 # CONFIG_USB_ISP1301 is not set
 # end of USB Physical Layer drivers
 
-# CONFIG_USB_GADGET is not set
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_SNP_UDC_PLAT is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_GADGET_XILINX is not set
+# CONFIG_USB_MAX3420_UDC is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_F_SS_LB=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_FS=y
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_HID=y
+CONFIG_USB_F_PRINTER=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+
+#
+# USB Gadget precomposed configurations
+#
+# CONFIG_USB_ZERO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_RAW_GADGET is not set
+# end of USB Gadget precomposed configurations
+
 # CONFIG_TYPEC is not set
 # CONFIG_USB_ROLE_SWITCH is not set
 CONFIG_MMC=y
@@ -4167,7 +4255,7 @@ CONFIG_NLS_CODEPAGE_850=m
 # CONFIG_NLS_CODEPAGE_1250 is not set
 # CONFIG_NLS_CODEPAGE_1251 is not set
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_ISO8859_2 is not set
 # CONFIG_NLS_ISO8859_3 is not set
 # CONFIG_NLS_ISO8859_4 is not set