bb-usb-gadgets (1.20240314.0)

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

bb-usb-gadgets/suite/bookworm/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# Pass boot fat partition over usb
+##USB_BOOT_MMC_ENABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
-USB_RNDIS_DISABLED=yes
+##USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/bookworm/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -35,6 +35,10 @@ if [ -f /etc/default/bb-boot ] ; then
 	. /etc/default/bb-boot
 fi
 
+if [ -f /etc/default/generic-sys-mods ] ; then
+	. /etc/default/generic-sys-mods
+fi
+
 log="usb_gadget:"
 
 usb_gadget="/sys/kernel/config/usb_gadget"
@@ -162,6 +166,18 @@ run_libcomposite () {
 			fi
 		fi
 
+		if [ "x${USB_BOOT_MMC_ENABLED}" = "xyes" ]; then
+			mkdir -p functions/mass_storage.usb1
+			echo ${usb_ms_stall} > functions/mass_storage.usb1/stall
+			echo ${usb_ms_cdrom} > functions/mass_storage.usb1/lun.0/cdrom
+			echo ${usb_ms_nofua} > functions/mass_storage.usb1/lun.0/nofua
+			echo ${usb_ms_removable} > functions/mass_storage.usb1/lun.0/removable
+			echo 0 > functions/mass_storage.usb1/lun.0/ro
+			echo ${ROOT_DRIVE}p1 > functions/mass_storage.usb1/lun.0/file
+
+			ln -s functions/mass_storage.usb1 configs/c.1/
+		fi
+
 		#mkdir -p functions/mass_storage.usb0
 		#echo 0 > functions/mass_storage.usb0/stall
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file

bb-usb-gadgets/suite/bookworm/debian/changelog

-bb-usb-gadgets (1.20230922.1-0~bookworm+20230925) bookworm; urgency=low
+bb-usb-gadgets (1.20240314.0-0~bookworm+20240314) bookworm; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 25 Sep 2023 17:06:03 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 14 Mar 2024 15:50:52 -0500
 

bb-usb-gadgets/suite/bullseye/debian/changelog

-bb-usb-gadgets (1.20230922.1-0~bullseye+20230925) bullseye; urgency=low
+bb-usb-gadgets (1.20240314.0-0~bullseye+20240314) bullseye; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 25 Sep 2023 17:06:03 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 14 Mar 2024 15:50:52 -0500
 

bb-usb-gadgets/suite/jammy/debian/changelog

-bb-usb-gadgets (1.20230922.1-0~jammy+20230925) jammy; urgency=low
+bb-usb-gadgets (1.20240314.0-0~jammy+20240314) jammy; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 25 Sep 2023 17:06:03 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 14 Mar 2024 15:50:52 -0500
 

bb-usb-gadgets/suite/trixie/debian/bb-boot

@@ -5,5 +5,8 @@
 # other values take no effect, and are ignored. The only expected value is "yes"
 ##USB_IMAGE_FILE_DISABLED=yes
 
+# Pass boot fat partition over usb
+##USB_BOOT_MMC_ENABLED=yes
+
 # Mainline Linux is removing RNDIS Support, NCM works in Windows 11...
 USB_RNDIS_DISABLED=yes

bb-usb-gadgets/suite/trixie/debian/bb-start-acm-ncm-rndis-old-gadget

@@ -35,6 +35,10 @@ if [ -f /etc/default/bb-boot ] ; then
 	. /etc/default/bb-boot
 fi
 
+if [ -f /etc/default/generic-sys-mods ] ; then
+	. /etc/default/generic-sys-mods
+fi
+
 log="usb_gadget:"
 
 usb_gadget="/sys/kernel/config/usb_gadget"
@@ -162,6 +166,18 @@ run_libcomposite () {
 			fi
 		fi
 
+		if [ "x${USB_BOOT_MMC_ENABLED}" = "xyes" ]; then
+			mkdir -p functions/mass_storage.usb1
+			echo ${usb_ms_stall} > functions/mass_storage.usb1/stall
+			echo ${usb_ms_cdrom} > functions/mass_storage.usb1/lun.0/cdrom
+			echo ${usb_ms_nofua} > functions/mass_storage.usb1/lun.0/nofua
+			echo ${usb_ms_removable} > functions/mass_storage.usb1/lun.0/removable
+			echo 0 > functions/mass_storage.usb1/lun.0/ro
+			echo ${ROOT_DRIVE}p1 > functions/mass_storage.usb1/lun.0/file
+
+			ln -s functions/mass_storage.usb1 configs/c.1/
+		fi
+
 		#mkdir -p functions/mass_storage.usb0
 		#echo 0 > functions/mass_storage.usb0/stall
 		#echo /dev/nbd0 > functions/mass_storage.usb0/lun.0/file

bb-usb-gadgets/suite/trixie/debian/changelog

-bb-usb-gadgets (1.20230922.1-0~trixie+20230925) trixie; urgency=low
+bb-usb-gadgets (1.20240314.0-0~trixie+20240314) trixie; urgency=low
 
   * Mainline linux is removing RNDIS support, in Debian 12/13 (Bookworm/Trixie), we default to only NCM usb0 which works in Windows 11
   * Automatically generate /etc/default/bb-mac-addr if file doesnt exist
 
- -- Robert Nelson <robertcnelson@gmail.com>  Mon, 25 Sep 2023 17:06:03 -0500
+ -- Robert Nelson <robertcnelson@gmail.com>  Thu, 14 Mar 2024 15:50:52 -0500
 

bb-usb-gadgets/version.sh

@@ -2,7 +2,7 @@
 
 package_name="bb-usb-gadgets"
 debian_pkg_name="${package_name}"
-package_version="1.20230922.1"
+package_version="1.20240314.0"
 package_source=""
 src_dir=""
 
@@ -17,7 +17,7 @@ debian_patch=""
 
 clear_changelog="enable"
 
-bullseye_version="~bullseye+20230925"
-bookworm_version="~bookworm+20230925"
-trixie_version="~trixie+20230925"
-jammy_version="~jammy+20230925"
+bullseye_version="~bullseye+20240314"
+bookworm_version="~bookworm+20240314"
+trixie_version="~trixie+20240314"
+jammy_version="~jammy+20240314"