From 98cfc962ad27f38209932da30d35a683998caac1 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 18 Sep 2023 16:01:37 -0500 Subject: [PATCH] rootfs: bb-usb-gadgets should work now Signed-off-by: Robert Nelson --- 06_generate_debian_console_root.sh | 5 ----- 06_generate_ubuntu_console_root.sh | 5 ----- patches/linux/mpfs_defconfig | 16 ++-------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh index 1deee26..8f93acc 100755 --- a/06_generate_debian_console_root.sh +++ b/06_generate_debian_console_root.sh @@ -55,11 +55,6 @@ echo '/dev/mmcblk0p2 /boot/firmware/ auto defaults 0 2' >> ./ignore/.root/et echo '/dev/mmcblk0p3 / auto errors=remount-ro 0 1' >> ./ignore/.root/etc/fstab echo 'debugfs /sys/kernel/debug debugfs mode=755,uid=root,gid=gpio,defaults 0 0' >> ./ignore/.root/etc/fstab -rm -rf ./ignore/.root/usr/lib/systemd/system/bb-usb-gadgets.service || true -rm -rf ./ignore/.root/etc/systemd/system/getty.target.wants/serial-getty@ttyGS0.service || true -rm -rf ./ignore/.root/etc/systemd/network/usb0.network || true -rm -rf ./ignore/.root/etc/systemd/network/usb1.network || true - cp -v ./ignore/.root/etc/bbb.io/templates/eth0-DHCP.network ./ignore/.root/etc/systemd/network/eth0.network || true if [ -f ./ignore/.root/etc/systemd/system/multi-user.target.wants/wpa_supplicant@wlan0.service ] ; then diff --git a/06_generate_ubuntu_console_root.sh b/06_generate_ubuntu_console_root.sh index 938a757..5cd9bf1 100755 --- a/06_generate_ubuntu_console_root.sh +++ b/06_generate_ubuntu_console_root.sh @@ -59,11 +59,6 @@ echo '/dev/mmcblk0p2 /boot/firmware/ auto defaults 0 2' >> ./ignore/.root/et echo '/dev/mmcblk0p3 / auto errors=remount-ro 0 1' >> ./ignore/.root/etc/fstab echo 'debugfs /sys/kernel/debug debugfs mode=755,uid=root,gid=gpio,defaults 0 0' >> ./ignore/.root/etc/fstab -rm -rf ./ignore/.root/usr/lib/systemd/system/bb-usb-gadgets.service || true -rm -rf ./ignore/.root/etc/systemd/system/getty.target.wants/serial-getty@ttyGS0.service || true -rm -rf ./ignore/.root/etc/systemd/network/usb0.network || true -rm -rf ./ignore/.root/etc/systemd/network/usb1.network || true - cp -v ./ignore/.root/etc/bbb.io/templates/eth0-DHCP.network ./ignore/.root/etc/systemd/network/eth0.network || true if [ -f ./ignore/.root/etc/systemd/system/multi-user.target.wants/wpa_supplicant@wlan0.service ] ; then diff --git a/patches/linux/mpfs_defconfig b/patches/linux/mpfs_defconfig index f6b3b3f..2886130 100644 --- a/patches/linux/mpfs_defconfig +++ b/patches/linux/mpfs_defconfig @@ -4002,15 +4002,13 @@ CONFIG_USB_F_SERIAL=y CONFIG_USB_F_OBEX=y CONFIG_USB_F_NCM=y CONFIG_USB_F_ECM=y +CONFIG_USB_F_PHONET=m 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_UAC1=m -CONFIG_USB_F_UAC2=m -CONFIG_USB_F_UVC=y -CONFIG_USB_F_MIDI=m +CONFIG_USB_F_UVC=m CONFIG_USB_F_HID=y CONFIG_USB_F_PRINTER=y CONFIG_USB_CONFIGFS=y @@ -4026,22 +4024,14 @@ CONFIG_USB_CONFIGFS_PHONET=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_UAC1=y -# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -CONFIG_USB_CONFIGFS_F_UAC2=y -CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y -# CONFIG_USB_CONFIGFS_F_TCM is not set # # USB Gadget precomposed configurations # CONFIG_USB_ZERO=m -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_AUDIO=m -# CONFIG_GADGET_UAC1 is not set CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y # CONFIG_USB_ETH_EEM is not set @@ -4052,9 +4042,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y CONFIG_USB_MASS_STORAGE=m -# CONFIG_USB_GADGET_TARGET is not set CONFIG_USB_G_SERIAL=m -CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m CONFIG_USB_CDC_COMPOSITE=m CONFIG_USB_G_NOKIA=m