Merge branch 'main' into desktop-to-armbian-config

Author: igorpecovnik

config/boards/helios4.conf

@@ -13,6 +13,7 @@ FORCE_BOOTSCRIPT_UPDATE="yes"
 KERNEL_TARGET="current,edge"
 KERNEL_TEST_TARGET="current"
 
+enable_extension "watchdog"
 # Enable btrfs support in u-boot
 enable_extension "uboot-btrfs"
 

config/boards/odroidhc4.conf

@@ -1,4 +1,4 @@
-# Amlogic S905X3 quad core 4GB RAM SoC GBE USB3 SPI 2 x SATA
+# Amlogic S905X3 quad core 4GB RAM SoC GBE USB2 SPI 2 x SATA
 BOARD_NAME="Odroid HC4"
 BOARD_VENDOR="hardkernel"
 BOARDFAMILY="meson-sm1"

config/boards/orangepi5.conf

@@ -7,7 +7,7 @@ INTRODUCED="2022"
 BOOTCONFIG="orangepi-5-rk3588s_defconfig" # vendor name, not standard, see hook below, set BOOT_SOC below to compensate
 BOOTCONFIG_SATA="orangepi-5-sata-rk3588s_defconfig"
 BOOT_SOC="rk3588"
-KERNEL_TARGET="current,edge,vendor"
+KERNEL_TARGET="current,edge,bleedingedge,vendor"
 KERNEL_TEST_TARGET="vendor,current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"

config/boards/photonicat2.csc

@@ -2,6 +2,7 @@
 
 BOARD_NAME="Photonicat2"
 BOARD_VENDOR="ariaboard"
+BOARD_MAINTAINER="HackingGate"
 BOARDFAMILY="rk35xx"
 INTRODUCED="2025"
 BOOT_SOC="rk3576"
@@ -21,10 +22,10 @@ enable_extension "uboot-btrfs"
 
 # Mainline U-Boot
 function post_family_config__photonicat2_mainline_uboot() {
-	display_alert "$BOARD" "Using Mainline U-Boot v2026.01" "info"
+	display_alert "$BOARD" "Using Mainline U-Boot v2026.04" "info"
 	declare -g BOOTSOURCE='https://github.com/u-boot/u-boot.git'
-	declare -g BOOTBRANCH='tag:v2026.01'
-	declare -g BOOTPATCHDIR='v2026.01'
+	declare -g BOOTBRANCH='tag:v2026.04'
+	declare -g BOOTPATCHDIR='v2026.04'
 	declare -g BOOTDIR="u-boot-${BOARD}"
 
 	# Use binman for Mainline U-Boot
@@ -38,3 +39,30 @@ function post_family_config__photonicat2_mainline_uboot() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}
 }
+
+# Install USB hub watchdog (recovers onboard USB hubs after warm-reboot drop)
+function post_family_tweaks_bsp__install_photonicat2_usb_hub_watchdog() {
+	display_alert "$BOARD" "Installing Photonicat2 USB hub watchdog" "info"
+
+	local watchdog_dir="${SRC}/packages/bsp/photonicat2/usb-hub-watchdog"
+
+	install -Dm 0755 "${watchdog_dir}/photonicat-usb-hub-watchdog-run" \
+		"${destination}/usr/lib/armbian/photonicat2-usb-hub-watchdog-run"
+
+	install -Dm 0644 "${watchdog_dir}/photonicat-usb-hub-watchdog.service" \
+		"${destination}/usr/lib/systemd/system/photonicat-usb-hub-watchdog.service"
+
+	install -Dm 0644 "${watchdog_dir}/photonicat-usb-hub-watchdog.timer" \
+		"${destination}/usr/lib/systemd/system/photonicat-usb-hub-watchdog.timer"
+}
+
+function post_family_tweaks__enable_photonicat2_usb_hub_watchdog() {
+	display_alert "$BOARD" "Enabling Photonicat2 USB hub watchdog" "info"
+
+	if chroot_sdcard systemctl enable photonicat-usb-hub-watchdog.timer; then
+		display_alert "$BOARD" "USB hub watchdog enabled" "info"
+	else
+		display_alert "$BOARD" "Failed to enable photonicat-usb-hub-watchdog.timer" "err"
+		return 1
+	fi
+}