Skip to content
View in the app

A better way to browse. Learn more.
Armbian Community Forums

A full-screen app on your home screen with push notifications, badges and more.

To install this app on iOS and iPadOS
  1. Tap the Share icon in Safari
  2. Scroll the menu and tap Add to Home Screen.
  3. Tap Add in the top-right corner.
To install this app on Android
  1. Tap the 3-dot menu (⋮) in the top-right corner of the browser.
  2. Tap Add to Home screen or Install app.
  3. Confirm by tapping Install.

Patches Collisions for OrangePi-Win

martinayotte
in Advanced users - Development

Featured Replies

Hi every devs !

 

(some of you know that I was on other duties those past months, mainly constructing my new house and moving in it, but I'm now back to Armbian builds those recent days after more then 6 busy months)

 

I've noticed yesterday that USB1-DRVVBUS/PD7 was not activated any more in my recent build, although the fix-many-orangepiwin-dts.patch should take care of that and this one is successfully applied.

After digging the issue, I've found out that the sunxi64-hdmi-thermal-dma-pmw-enable.patch is reverting many of those, probably unintentionally, and since this patch is applied after the first one, things are revert silently.

 

Should I simply trim the sunxi64-hdmi-thermal-dma-pmw-enable.patch the unwanted reverts ?

 

Edit : Igor ? It seems that those collisions have been introduced on Jan 3rd ... Were they intentionals, or was that patch generated without properly applying others ?

 

 

 


+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+index 6ecb700..376d7bf 100644

+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+@@ -51,31 +51,15 @@

+ compatible = "xunlong,orangepi-win", "allwinner,sun50i-a64";

+

+ aliases {

++ ethernet0 = &emac;

+ serial0 = &uart0;

++ serial1 = &uart1;

+ };

+

+ chosen {

+ stdout-path = "serial0:115200n8";

+ };

+

+- reg_vcc3v3: vcc3v3 {

+- compatible = "regulator-fixed";

+- regulator-name = "vcc3v3";

+- regulator-min-microvolt = <3300000>;

+- regulator-max-microvolt = <3300000>;

+- };

+-

+- reg_usb1_vbus: usb1-vbus {

+- compatible = "regulator-fixed";

+- regulator-name = "usb1-vbus";

+- regulator-min-microvolt = <5000000>;

+- regulator-max-microvolt = <5000000>;

+- regulator-boot-on;

+- enable-active-high;

+- gpio = <&pio 3 7 GPIO_ACTIVE_HIGH>;

+- status = "okay";

+- };

+-

+ wifi_pwrseq: wifi_pwrseq {

+ compatible = "mmc-pwrseq-simple";

+ reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */

 

...

 

+ &usbphy {

+- usb1_vbus-supply = <&reg_usb1_vbus>;

+ status = "okay";

+ };
 

 

 

Edit2 : I've committed the fix, hopefully it doesn't break any thing else ...

https://github.com/armbian/build/commit/c0a40f327c5024392c1d59c23611d9e6abb18c38#diff-5dbb1fe61dcfe9a242fef90ea4f6f544

 

 

Guest
This topic is now closed to further replies.
Go to topic listing

Account

Navigation

Search

Search

Configure browser push notifications
Chrome (Android)
  1. Tap the lock icon next to the address bar.
  2. Tap Permissions → Notifications.
  3. Adjust your preference.
Chrome (Desktop)
  1. Click the padlock icon in the address bar.
  2. Select Site settings.
  3. Find Notifications and adjust your preference.