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

Orange Pi Zero: Fix usb otg after 6.12 update #7661

Merged
merged 3 commits into from
Jan 7, 2025

Conversation

ArendJan
Copy link
Contributor

@ArendJan ArendJan commented Jan 6, 2025

Description

USB OTG feature was broken on the Orange Pi Zero (1) on kernel 6.11. Fixed in #7614 , but then #7577 didn't copy it to the new patches folder.

How Has This Been Tested?

Created image like in #7614 and tried an OTG script.

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings

@github-actions github-actions bot added size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Jan 6, 2025
@ArendJan
Copy link
Contributor Author

ArendJan commented Jan 6, 2025

I got one warning/error:

--> (7) INFO: Calling Python patching script for kernel: [ https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - tag:v6.12.6 ]
--> (7) INFO: Using kernel patch dir: [ archive/sunxi-6.12 ]
--> (7) COMMAND: [...shortened kernel patching...] /usr/bin/python3 /armbian/lib/tools/patching.py
   Failed to parse unidiff for file /armbian/patch/kernel/archive/sunxi-6.12/patches.armbian/orangepizero-fix-usb-otg.patch(:1): 'Hunk is shorter than expected'
   Applying 423 patches from 423 files of which 1 driver patches, 422 patches in series...
   -> 001/423: /armbian/cache/patch/kernel-drivers/sha1_e9d65b48ce1aba50e9ec7eab6d9f73d1ba88420e_sunxi_edge_6d0ed4a1_2af55cb0-01ba4719(:1) 

and

   │  orangepizero-fix-usb-otg                                                            │ (+0/-0)[] ?                         │ :                                        │

in the patches table below it
EDIT: I removed the kernel workdir and retried it, same warning, but the patch was applied, so I assume not an issue

@ArendJan ArendJan changed the title Fix usb otg after 6.12 update Fix Orange Pi Zero usb otg after 6.12 update Jan 7, 2025
@ArendJan ArendJan changed the title Fix Orange Pi Zero usb otg after 6.12 update Orange Pi Zero: Fix usb otg after 6.12 update Jan 7, 2025
@igorpecovnik
Copy link
Member

Are there still any warning / errors?

@ArendJan
Copy link
Contributor Author

ArendJan commented Jan 7, 2025

It's now fixed, index and line numbers were wrong. It shows no warning/errors, patch shows as last one in the patches table (in yellow)

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 02 Milestone: First quarter release and removed Needs review Seeking for review labels Jan 7, 2025
@ArendJan ArendJan force-pushed the fix-orangepizero-usb-otg-6.12 branch from 1308391 to 07dd3d3 Compare January 7, 2025 12:06
@github-actions github-actions bot removed the Ready to merge Reviewed, tested and ready for merge label Jan 7, 2025
@github-actions github-actions bot added the Needs review Seeking for review label Jan 7, 2025
@igorpecovnik igorpecovnik merged commit eb8d632 into armbian:main Jan 7, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

2 participants