Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Odroid UMS gadgets #3175

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildroot-external/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ source "$BR2_EXTERNAL_HASSOS_PATH/package/os-agent/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/pi-bluetooth/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/qemu-guest-agent/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/lxd-guest-agent/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/linux-gadget/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/rockchip-blobs/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-eeprom/Config.in"
source "$BR2_EXTERNAL_HASSOS_PATH/package/rpi-rf-mod/Config.in"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 6e5ac47bd70658098b9e31b63484e6bf061c6183 Mon Sep 17 00:00:00 2001
From: Tim Lunn <[email protected]>
Date: Mon, 29 Jan 2024 15:04:59 +1100
Subject: [PATCH] set peripheral mode for usb otg port

---
arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
index a5d9216b544b..2dda6038930e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts
@@ -642,7 +642,7 @@ &usb_host0_ohci {
};

&usb_host0_xhci {
- dr_mode = "otg";
+ dr_mode = "peripheral";
status = "okay";
};

--
2.40.1

3 changes: 3 additions & 0 deletions buildroot-external/configs/odroid_m1s_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ BR2_PACKAGE_HASSIO_ARCH="aarch64"
BR2_PACKAGE_HASSIO_MACHINE="odroid-m1"
BR2_PACKAGE_OS_AGENT=y
BR2_PACKAGE_OS_AGENT_BOARD="OdroidM1S"
BR2_PACKAGE_LINUX_GADGET=y
BR2_PACKAGE_LINUX_GADGET_GETTY=y
BR2_PACKAGE_LINUX_GADGET_UMS=y
BR2_PACKAGE_ROCKCHIP_BLOBS=y
BR2_PACKAGE_ROCKCHIP_BLOBS_VERSION="b4558da0860ca48bf1a571dd33ccba580b9abe23"
BR2_PACKAGE_ROCKCHIP_BLOBS_ATF="bin/rk35/rk3568_bl31_v1.43.elf"
Expand Down
28 changes: 28 additions & 0 deletions buildroot-external/package/linux-gadget/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
config BR2_PACKAGE_LINUX_GADGET
bool "Activate CDC UMS gadget"
depends on BR2_LINUX_KERNEL
help
Activate linux gadgets for CDC console and UMS

if BR2_PACKAGE_LINUX_GADGET

config BR2_PACKAGE_LINUX_GADGET_GETTY
bool "CDC-ACM Getty"
help
Activate getty console on OTG port

config BR2_PACKAGE_LINUX_GADGET_UMS
bool "UMS Gadget"
help
Activate UMS gadget on OTG port
if BR2_PACKAGE_LINUX_GADGET_UMS

config BR2_PACKAGE_LINUX_GADGET_UMS_LUN
string "UMS LUN"
default "/dev/mmcblk0"
help
LUN backing file for UMS gadget

endif

endif
42 changes: 42 additions & 0 deletions buildroot-external/package/linux-gadget/linux-gadget.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
LINUX_GADGET_VERSION = 0.99.0
LINUX_GADGET_LICENSE = Apache License 2.0
LINUX_GADGET_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
LINUX_GADGET_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/linux-gadget
LINUX_GADGET_SITE_METHOD = local

ifneq ($(BR2_PACKAGE_LINUX_GADGET_GETTY),y)
LINUX_GADGET_MOD = "g_mass_storage"
else ifneq ($(BR2_PACKAGE_LINUX_GADGET_UMS),y)
LINUX_GADGET_MOD = "g_serial"
else
LINUX_GADGET_MOD = "g_acm_ms"
endif

ifeq ($(BR2_PACKAGE_LINUX_GADGET_UMS),y)
LINUX_GADGET_OPT = "file=$(BR2_PACKAGE_LINUX_GADGET_UMS_LUN)"
endif

define LINUX_GADGET_BUILD_CMDS
echo $(LINUX_GADGET_MOD) > $(@D)/gadget.conf
if [[ -n $(LINUX_GADGET_OPT) ]]; then \
echo $(LINUX_GADGET_OPT) > $(@D)/gadget_opt.conf; \
fi
endef

define LINUX_GADGET_INSTALL_TARGET_CMDS
$(INSTALL) -m 0644 -D $(@D)/gadget.conf \
$(TARGET_DIR)/etc/modules-load.d/gadget.conf

if [ "$(BR2_PACKAGE_LINUX_GADGET_GETTY)" = "y" ]; then \
$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/getty.target.wants; \
ln -fs "/usr/lib/systemd/system/[email protected]" \
"$(TARGET_DIR)/etc/systemd/system/getty.target.wants/[email protected]"; \
fi

if [[ -n $(LINUX_GADGET_OPT) ]]; then \
$(INSTALL) -m 0644 -D $(@D)/gadget_opt.conf \
$(TARGET_DIR)/etc/modprobe.d/gadget.conf; \
fi
endef

$(eval $(generic-package))