Merge 3c8514007a into ec582c9b50

AR-2758 : fix libwmf0.2-7-gtk bad name
config: boards: pocketbeagle2: Enable better USB Gadget
2025-09-24 15:10:14 +08:00 · 2025-09-24 08:16:21 +02:00 · 2025-09-08 10:56:11 +05:30
31 changed files with 178 additions and 31 deletions
--- a/config/boards/pocketbeagle2.conf
+++ b/config/boards/pocketbeagle2.conf
@ -10,13 +10,55 @@ TIBOOT3_FILE="tiboot3-am62x-hs-fs-evm.bin"
 DEFAULT_CONSOLE="serial"
 KERNEL_TARGET="edge"
 KERNEL_TEST_TARGET="edge"
-SERIALCON="ttyS2,ttyGS0"
+SERIALCON="ttyS2"
 ATF_BOARD="lite"
 SRC_EXTLINUX="yes"
-SRC_CMDLINE="root=/dev/mmcblk1p2 rootwait console=ttyS2,115200n8 console=ttyGS0,115200n8 modules-load=dwc2,g_cdc"
+SRC_CMDLINE="root=/dev/mmcblk1p2 rootwait console=ttyS2,115200n8"
 BOOT_FDT_FILE="ti/k3-am6232-pocketbeagle2.dtb"
 OPTEE_PLATFORM="k3-am62x"

+# USB Gadget
+function post_family_tweaks_bsp__pocketbeagle2_firmware() {
+	display_alert "Setup USB Gadget for ${BOARD}" "${RELEASE}" "warn"
+
+	# USB Gadget Network service
+	mkdir -p $destination/usr/local/bin/
+	mkdir -p $destination/usr/lib/systemd/system/
+	mkdir -p $destination/etc/initramfs-tools/scripts/init-bottom/
+	# The service expects the name setup-usbgadget-network.sh. Depending on the board vendor, the
+	# usbgadget configuration they would like can be wildly different. However, the same service
+	# will work fine for almost all cases. So better to rename file rather than modifying the service.
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/setup-usbgadget-network-multi.sh $destination/usr/local/bin/setup-usbgadget-network.sh ||
+		exit_with_error "Failed to install USB gadget setup script"
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/remove-usbgadget-network.sh $destination/usr/local/bin/ ||
+		exit_with_error "Failed to install USB gadget remove script"
+	install -Dm744 $SRC/packages/bsp/usb-gadget-network/usbgadget-rndis.service $destination/usr/lib/systemd/system/ ||
+		exit_with_error "Failed to install USB gadget service"
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-hook $destination/etc/initramfs-tools/hooks/usb-gadget ||
+		exit_with_error "Failed to install USB gadget initramfs hook"
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/usb-gadget-initramfs-premount $destination/etc/initramfs-tools/scripts/init-premount/usb-gadget ||
+		exit_with_error "Failed to install USB gadget initramfs premount script"
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/dropbear $destination/etc/initramfs-tools/scripts/init-premount/ ||
+		exit_with_error "Failed to install USB gadget initramfs premount dropbear"
+	install -Dm755 $SRC/packages/bsp/usb-gadget-network/kill-dropbear $destination/etc/initramfs-tools/scripts/init-bottom/ ||
+		exit_with_error "Failed to install USB gadget initramfs premount kill dropbear"
+}
+
+function post_family_tweaks__pocketbeagle2_enable_services() {
+	display_alert "Enable Services for ${BOARD}" "${RELEASE}" "warn"
+
+	# We need unudhcpd from armbian repo, so enable it
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.sources
+	do_with_retries 3 chroot_sdcard_apt_get_install unudhcpd
+	# disable armbian repo back
+	mv "${SDCARD}"/etc/apt/sources.list.d/armbian.sources "${SDCARD}"/etc/apt/sources.list.d/armbian.sources.disabled
+
+	chroot_sdcard systemctl enable usbgadget-rndis.service
+	# We want custom IPs. systemctl edit does not seem to work in chroot.
+	mkdir -p "${SDCARD}"/etc/systemd/system/usbgadget-rndis.service.d
+	echo -e "[Service]\nEnvironment=\"unudhcpd_host_ip=192.168.7.2\"\nEnvironment=\"unudhcpd_client_ip=192.168.7.3\"" > "${SDCARD}"/etc/systemd/system/usbgadget-rndis.service.d/override.conf
+}
+
 function current_beagle_kernel_uboot() {
 	declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel
 	declare -g KERNEL_MAJOR_MINOR="6.12"
--- a/config/desktop/bookworm/environments/budgie/config_base/packages
+++ b/config/desktop/bookworm/environments/budgie/config_base/packages
@ -85,7 +85,7 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 gdm3
--- a/config/desktop/bookworm/environments/i3-wm/config_base/packages
+++ b/config/desktop/bookworm/environments/i3-wm/config_base/packages
@ -72,7 +72,7 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/bookworm/environments/kde-plasma/config_base/packages
+++ b/config/desktop/bookworm/environments/kde-plasma/config_base/packages
@ -61,7 +61,7 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
--- a/config/desktop/bookworm/environments/xfce/config_base/packages
+++ b/config/desktop/bookworm/environments/xfce/config_base/packages
@ -50,7 +50,7 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/bookworm/environments/xmonad/config_base/packages
+++ b/config/desktop/bookworm/environments/xmonad/config_base/packages
@ -63,7 +63,7 @@ libgnome-bluetooth13
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 lightdm
--- a/config/desktop/common/environments/budgie/config_base/packages
+++ b/config/desktop/common/environments/budgie/config_base/packages
@ -108,7 +108,7 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 gdm3
 mesa-utils
--- a/config/desktop/common/environments/deepin/config_base/packages
+++ b/config/desktop/common/environments/deepin/config_base/packages
@ -118,7 +118,7 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lightdm-settings
--- a/config/desktop/common/environments/enlightenment/config_base/packages
+++ b/config/desktop/common/environments/enlightenment/config_base/packages
@ -84,7 +84,7 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lxtask
--- a/config/desktop/common/environments/i3-wm/config_base/packages
+++ b/config/desktop/common/environments/i3-wm/config_base/packages
@ -77,7 +77,7 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/common/environments/kde-plasma/config_base/packages
+++ b/config/desktop/common/environments/kde-plasma/config_base/packages
@ -80,7 +80,7 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
--- a/config/desktop/common/environments/mate/config_base/packages
+++ b/config/desktop/common/environments/mate/config_base/packages
@ -80,7 +80,7 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lightdm-settings
--- a/config/desktop/common/environments/xfce/config_base/packages
+++ b/config/desktop/common/environments/xfce/config_base/packages
@ -51,7 +51,7 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/common/environments/xmonad/config_base/packages
+++ b/config/desktop/common/environments/xmonad/config_base/packages
@ -70,7 +70,7 @@ libghc-xmonad-wallpaper-dev
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lightdm-gtk-greeter
--- a/config/desktop/jammy/environments/budgie/config_base/packages
+++ b/config/desktop/jammy/environments/budgie/config_base/packages
@ -108,7 +108,7 @@ libplank1
 libplank-common
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 gdm3
--- a/config/desktop/jammy/environments/i3-wm/config_base/packages
+++ b/config/desktop/jammy/environments/i3-wm/config_base/packages
@ -79,7 +79,7 @@ libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/jammy/environments/kde-plasma/config_base/packages
+++ b/config/desktop/jammy/environments/kde-plasma/config_base/packages
@ -80,7 +80,7 @@ libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
--- a/config/desktop/jammy/environments/xfce/config_base/packages
+++ b/config/desktop/jammy/environments/xfce/config_base/packages
@ -54,7 +54,7 @@ libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/jammy/environments/xmonad/config_base/packages
+++ b/config/desktop/jammy/environments/xmonad/config_base/packages
@ -74,7 +74,7 @@ libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 lightdm
--- a/config/desktop/noble/environments/i3-wm/config_base/packages
+++ b/config/desktop/noble/environments/i3-wm/config_base/packages
@ -74,7 +74,7 @@ libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/noble/environments/xfce/config_base/packages
+++ b/config/desktop/noble/environments/xfce/config_base/packages
@ -54,7 +54,7 @@ libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/plucky/environments/i3-wm/config_base/packages
+++ b/config/desktop/plucky/environments/i3-wm/config_base/packages
@ -73,7 +73,7 @@ libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/plucky/environments/kde-plasma/config_base/packages
+++ b/config/desktop/plucky/environments/kde-plasma/config_base/packages
@ -80,7 +80,7 @@ libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
--- a/config/desktop/plucky/environments/xfce/config_base/packages
+++ b/config/desktop/plucky/environments/xfce/config_base/packages
@ -54,7 +54,7 @@ libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
 libu2f-udev
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/sid/environments/xfce/config_base/packages
+++ b/config/desktop/sid/environments/xfce/config_base/packages
@ -49,7 +49,7 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/trixie/environments/budgie/config_base/packages
+++ b/config/desktop/trixie/environments/budgie/config_base/packages
@ -83,7 +83,7 @@ libnotify-bin
 libplank1
 libplank-common
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 gdm3
--- a/config/desktop/trixie/environments/i3-wm/config_base/packages
+++ b/config/desktop/trixie/environments/i3-wm/config_base/packages
@ -72,7 +72,7 @@ libgsettings-qt1
 libjson-xs-perl
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcb-cursor0
 libxcursor1
 lightdm
--- a/config/desktop/trixie/environments/kde-plasma/config_base/packages
+++ b/config/desktop/trixie/environments/kde-plasma/config_base/packages
@ -60,7 +60,7 @@ libgsettings-qt1
 libgtk2.0-bin
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 sddm
 mesa-utils
--- a/config/desktop/trixie/environments/xfce/config_base/packages
+++ b/config/desktop/trixie/environments/xfce/config_base/packages
@ -49,7 +49,7 @@ libgtk2.0-bin
 libnotify-bin
 libpam-gnome-keyring
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxcursor1
 lightdm
 lm-sensors
--- a/config/desktop/trixie/environments/xmonad/config_base/packages
+++ b/config/desktop/trixie/environments/xmonad/config_base/packages
@ -62,7 +62,7 @@ libghc-xmonad-wallpaper-dev
 libgsettings-qt1
 libnotify-bin
 libproxy1-plugin-gsettings
-libwmf0.2-7-gtk
+libwmf-0.2-7-gtk
 libxapp1
 libxcursor1
 lightdm
--- a/packages/bsp/usb-gadget-network/setup-usbgadget-network-multi.sh
+++ b/packages/bsp/usb-gadget-network/setup-usbgadget-network-multi.sh
@ -0,0 +1,105 @@
+#!/bin/bash
+set -euo pipefail
+
+deviceinfo_name="USB Gadget Network"
+deviceinfo_manufacturer="Armbian"
+#deviceinfo_usb_idVendor=
+#deviceinfo_usb_idProduct=
+#deviceinfo_usb_serialnumber=
+
+exit_with_error() {
+	echo "$1"
+	exit 1
+}
+
+setup_usb_network_configfs() {
+	# See: https://www.kernel.org/doc/Documentation/usb/gadget_configfs.txt
+	CONFIGFS=/sys/kernel/config/usb_gadget
+
+	if ! [ -e "$CONFIGFS" ]; then
+		exit_with_error "$CONFIGFS does not exist, skipping configfs usb gadget"
+	fi
+
+	if [ -e "$CONFIGFS/g1" ]; then
+		echo "$CONFIGFS/g1 already exists, skipping configfs usb gadget"
+		return
+	fi
+
+	# Default values for USB-related deviceinfo variables
+	usb_idVendor="${deviceinfo_usb_idVendor:-0x1D6B}"   # Linux Foundation
+	usb_idProduct="${deviceinfo_usb_idProduct:-0x0104}" # Multifunction Composite Gadget
+	usb_serialnumber="${deviceinfo_usb_serialnumber:-0123456789}"
+	usb_network_function="ncm.usb0"
+	usb_serial_function="acm.usb0"
+
+	echo "Setting up an USB gadget through configfs"
+	# Create an usb gadet configuration
+	mkdir $CONFIGFS/g1 || exit_with_error "Couldn't create $CONFIGFS/g1"
+	echo "$usb_idVendor" > "$CONFIGFS/g1/idVendor"
+	echo "$usb_idProduct" > "$CONFIGFS/g1/idProduct"
+	echo 0x0404 > "$CONFIGFS/g1/bcdDevice"
+	echo 0x0200 > "$CONFIGFS/g1/bcdUSB"
+
+	# Create english (0x409) strings
+	mkdir $CONFIGFS/g1/strings/0x409 || echo "Couldn't create $CONFIGFS/g1/strings/0x409"
+
+	# shellcheck disable=SC2154
+	echo "$deviceinfo_manufacturer" > "$CONFIGFS/g1/strings/0x409/manufacturer"
+	echo "$usb_serialnumber" > "$CONFIGFS/g1/strings/0x409/serialnumber"
+	# shellcheck disable=SC2154
+	echo "$deviceinfo_name" > "$CONFIGFS/g1/strings/0x409/product"
+
+	# Create network function.
+	mkdir $CONFIGFS/g1/functions/"$usb_network_function" ||
+		echo "Couldn't create $CONFIGFS/g1/functions/$usb_network_function"
+
+	# Create configuration instance for the gadget
+	mkdir $CONFIGFS/g1/configs/c.1 ||
+		echo "Couldn't create $CONFIGFS/g1/configs/c.1"
+	echo 250 > $CONFIGFS/g1/configs/c.1/MaxPower
+	mkdir $CONFIGFS/g1/configs/c.1/strings/0x409 ||
+		echo "Couldn't create $CONFIGFS/g1/configs/c.1/strings/0x409"
+	echo "NCM Configuration" > $CONFIGFS/g1/configs/c.1/strings/0x409/configuration ||
+		echo "Couldn't write configration name"
+
+	# Link the network instance to the configuration
+	ln -s $CONFIGFS/g1/functions/"$usb_network_function" $CONFIGFS/g1/configs/c.1 ||
+		echo "Couldn't symlink $usb_network_function"
+
+	mkdir -p $CONFIGFS/g1/functions/"$usb_serial_function" ||
+		echo "Couldn't create $CONFIGFS/g1/functions/$usb_serial_function"
+	ln -s $CONFIGFS/g1/functions/"$usb_serial_function" $CONFIGFS/g1/configs/c.1 ||
+		echo "Couldn't symlink $usb_serial_function"
+
+	# Check if there's an USB Device Controller
+	if [ ! -d /sys/class/udc ] || [ -z "$(ls /sys/class/udc 2>/dev/null)" ]; then
+		exit_with_error "No USB Device Controller available"
+	fi
+
+	# Link the gadget instance to an USB Device Controller. This activates the gadget.
+	# See also: https://github.com/postmarketOS/pmbootstrap/issues/338
+	# shellcheck disable=SC2005
+	ls /sys/class/udc | head -1 > $CONFIGFS/g1/UDC || exit_with_error "Couldn't write UDC"
+}
+
+set_usbgadget_ipaddress() {
+	local host_ip="${unudhcpd_host_ip:-172.16.42.1}"
+	local client_ip="${unudhcpd_client_ip:-172.16.42.2}"
+	echo "Starting dnsmasq with server ip $host_ip, client ip: $client_ip"
+	# Get usb interface
+	INTERFACE=""
+	ip addr replace "${host_ip}/16" dev usb0 2>/dev/null && ip link set usb0 up && INTERFACE=usb0
+	if [ -z "$INTERFACE" ]; then
+		echo "Interfaces:"
+		ip link
+		exit_with_error "Could not find an interface to run a dhcp server on"
+	fi
+
+	echo "Using interface $INTERFACE"
+	echo "Starting the DHCP daemon"
+	ip a show $INTERFACE > /var/log/unudhcpd.log
+	nohup /usr/bin/unudhcpd -i "$INTERFACE" -s "$host_ip" -c "$client_ip" >> /var/log/unudhcpd.log 2>&1 &
+	return
+}
+setup_usb_network_configfs
+set_usbgadget_ipaddress
Author	SHA1	Message	Date
Ayush	645e0adf96	Merge `3c8514007a` into `ec582c9b50`	2025-09-24 15:10:14 +08:00
Eyolon	ec582c9b50	AR-2758 : fix libwmf0.2-7-gtk bad name	2025-09-24 08:16:21 +02:00
Ayush Singh	3c8514007a	config: boards: pocketbeagle2: Enable better USB Gadget - Use configfs API to setup Multifunction Composite Gadget - This is already done on all BeagleBoard debian images. - Allows ssh and serial over USB without any user setup. Signed-off-by: Ayush Singh <ayush@beagleboard.org>	2025-09-08 10:56:11 +05:30