Merge branch 'armbian:main' into main

config/boards/bananapim4berry.wip

@@ -0,0 +1,26 @@
+# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
+BOARD_NAME="BananaPi M4 Berry"
+BOARDFAMILY="sun50iw9-bpi"
+BOARD_MAINTAINER="The-going"
+BOOTCONFIG="bananapi_m4_berry_defconfig"
+
+BOOTPATCHDIR="v2025.01/board_bananapim4berry"
+BOOTBRANCH_BOARD="tag:v2025.01"
+
+OVERLAY_PREFIX="sun50i-h616"
+BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
+BOOT_LOGO="desktop"
+KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
+
+PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools gpiod libgpiod2 network-manager"
+
+function post_family_tweaks_bsp__bananapi_firmware() {
+	if [[ -d "$SRC/packages/bsp/bananapi/brcm" ]] && [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
+		mkdir -p "${destination}"/lib/firmware/updates/brcm
+		mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
+		display_alert "$BOARD" "Installing upstream firmware" "info"
+		cp -fr $SRC/packages/bsp/bananapi/brcm/* "${destination}"/lib/firmware/updates/brcm/
+		cp -fr $SRC/packages/bsp/bananapi/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
+	fi
+}

config/boards/sakurapi-rk3308b.csc

@@ -9,9 +9,13 @@ MODULES_LEGACY="g_serial"
 SERIALCON="ttyS0"
 KERNEL_TARGET="current"
 BOOT_FDT_FILE="rockchip/rk3308-sakurapi-rk3308b.dtb"
-MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
+MODULES_BLACKLIST="analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"
 BOOTBRANCH_BOARD="tag:v2022.04"
 BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+BOOT_SCENARIO="only-blobs"
+BL31_BLOB="rk33/rk3308_bl31_v2.26.elf"
+DDR_BLOB="rk33/rk3308_ddr_589MHz_uart2_m1_v1.30.bin"
+MINILOADER_BLOB="rk33/rk3308_miniloader_sd_nand_v1.13.bin"

config/kernel/linux-sun55iw3-syterkit-legacy.config

@@ -80,6 +80,7 @@ CONFIG_SENSOR_NVP6158C=m
 CONFIG_SENSOR_IMX386=m
 CONFIG_SENSOR_TP2815=m
 CONFIG_AW_DRM=y
+CONFIG_AW_DRM_ALIAS="sun4i-drm"
 CONFIG_AW_DRM_EDP=y
 CONFIG_AW_DRM_INNO_EDP13=y
 CONFIG_PANEL_EDP_GENERAL=y

config/sources/families/include/sunxi64_common.inc

@@ -31,7 +31,7 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.72"
+		declare -g KERNELBRANCH="tag:v6.6.75"
 		;;
 
 	edge)

config/sources/families/include/sunxi_common.inc

@@ -32,7 +32,7 @@ case $BRANCH in
 
 	current)
 		declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.6.72"
+		declare -g KERNELBRANCH="tag:v6.6.75"
 		;;
 
 	edge)

config/sources/families/sun50iw9-bpi.conf

@@ -18,7 +18,7 @@ case $BRANCH in
 		declare -g BOOTSOURCE='https://source.denx.de/u-boot/u-boot.git'
 		declare -g BOOTBRANCH="${BOOTBRANCH_BOARD}"
 		declare -g ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
-		declare -g ATFBRANCH='tag:lts-v2.10.7'
+		declare -g ATFBRANCH='tag:v2.12.0'
 		declare -g ATF_PLAT="sun50i_h616"
 		declare -g ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
 		declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'

lib/functions/logging/export-logs.sh

@@ -169,17 +169,39 @@ function export_ansi_logs() {
 	if [[ "${show_message_after_export:-"yes"}" != "skip" && "${ARMBIAN_INSIDE_DOCKERFILE_BUILD:-"no"}" != "yes" ]]; then
 		display_alert "ANSI log file built; inspect it by running:" "less -RS ${target_relative_to_src}"
 
-		# @TODO: compress...
-		declare paste_url="${PASTE_URL:-"https://paste.armbian.com/log"}"
+		# Define here the paste servers to use, in order: each will be tried in sequence until one works
+		declare -a paste_servers=("paste.armbian.com" "paste.armbian.de" "paste.next.armbian.com" "paste.armbian.eu")
+
+		# User can override by setting PASTE_SERVER_HOST=some.paste.server.com - it will be added as the first to try
+		if [[ "${PASTE_SERVER_HOST}" != "" ]]; then
+			display_alert "Using custom paste server" "${PASTE_SERVER_HOST}" "info"
+			paste_servers=("${PASTE_SERVER_HOST}" "${paste_servers[@]}")
+		fi
+
 		if [[ "${SHARE_LOG:-"no"}" == "yes" ]]; then
-			display_alert "SHARE_LOG=yes, uploading log" "uploading logs" "info"
-			declare logs_url="undetermined"
-			logs_url=$(curl --silent --data-binary "@${target_relative_to_src}" "${paste_url}" | xargs echo -n || true) # don't fail
-			display_alert "Log uploaded, share URL:" "${logs_url}" ""
-			# set output for GitHub Actions
-			github_actions_add_output logs_url "${logs_url}"
+			declare -i some_paste_server_worked=0
+			for paste_server in "${paste_servers[@]}"; do
+				declare paste_url="https://${paste_server}/log"
+				display_alert "SHARE_LOG=yes, uploading log" "uploading logs to '${paste_server}'" "info"
+				declare result_from_paste_server="undetermined"
+				result_from_paste_server=$(curl --silent --max-time 120 --data-binary "@${target_relative_to_src}" "${paste_url}" | xargs echo -n || true) # don't fail
+				# Check if the result_from_paste_server begin with https:// and the paste_server; if yes, it's a success, break the loop
+				if [[ "${result_from_paste_server}" == "https://${paste_server}/"* ]]; then
+					display_alert "Log uploaded, share URL:" "${result_from_paste_server}" ""
+					github_actions_add_output logs_url "${result_from_paste_server}" # set output for GitHub Actions
+					some_paste_server_worked=1
+					break
+				else
+					display_alert "Log upload failed, retrying with next server"
+				fi
+			done
+			[[ ${some_paste_server_worked} -eq 0 ]] && display_alert "Log upload failed" "No paste server worked" "warn"
 		else
-			display_alert "Share log manually (or SHARE_LOG=yes):" "curl --data-binary @${target_relative_to_src} ${paste_url}"
+			display_alert "Share log manually:" "use one of the commands below (or add SHARE_LOG=yes next time!)" "info"
+			for paste_server in "${paste_servers[@]}"; do
+				declare paste_url="https://${paste_server}/log"
+				display_alert "Share log manually:" "curl --data-binary @${target_relative_to_src} ${paste_url}"
+			done
 		fi
 	fi
 

patch/kernel/archive/rockchip64-6.12/dt/rk3308-sakurapi-rk3308b.dts

@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2019 Akash Gajjar <akash@openedev.com>
  * Copyright (c) 2019 Jagan Teki <jagan@openedev.com>
- * Copyright (C) 2024 Chiyuki Akatsuki
+ * Copyright (C) 2024 TheSnowfield
  */
 
 /dts-v1/;
@@ -108,6 +108,65 @@
 		pinctrl-0 = <&otg_vbus_drv>;
 		vin-supply = <&vcc5v0_sys>;
 	};
+
+	backlight: backlight {
+		status = "okay";
+		compatible = "pwm-backlight";
+		pwms = <&pwm1 0 25000 0>;
+		brightness-levels = <
+			  0   1   2   3   4   5   6   7
+			  8   9  10  11  12  13  14  15
+			 16  17  18  19  20  21  22  23
+			 24  25  26  27  28  29  30  31
+			 32  33  34  35  36  37  38  39
+			 40  41  42  43  44  45  46  47
+			 48  49  50  51  52  53  54  55
+			 56  57  58  59  60  61  62  63
+			 64  65  66  67  68  69  70  71
+			 72  73  74  75  76  77  78  79
+			 80  81  82  83  84  85  86  87
+			 88  89  90  91  92  93  94  95
+			 96  97  98  99 100 101 102 103
+			104 105 106 107 108 109 110 111
+			112 113 114 115 116 117 118 119
+			120 121 122 123 124 125 126 127
+			128 129 130 131 132 133 134 135
+			136 137 138 139 140 141 142 143
+			144 145 146 147 148 149 150 151
+			152 153 154 155 156 157 158 159
+			160 161 162 163 164 165 166 167
+			168 169 170 171 172 173 174 175
+			176 177 178 179 180 181 182 183
+			184 185 186 187 188 189 190 191
+			192 193 194 195 196 197 198 199
+			200 201 202 203 204 205 206 207
+			208 209 210 211 212 213 214 215
+			216 217 218 219 220 221 222 223
+			224 225 226 227 228 229 230 231
+			232 233 234 235 236 237 238 239
+			240 241 242 243 244 245 246 247
+			248 249 250 251 252 253 254 255>;
+		default-brightness-level = <200>;
+	};
+
+	display: panel {
+		compatible = "olimex,lcd-olinuxino-43-ts";
+		backlight = <&backlight>;
+		enable-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+		enable-delay-ms = <20>;
+		status = "okay";
+
+		panel_in: port {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			panel_in_rgb: endpoint {
+				reg = <0>;
+				remote-endpoint = <&vop_out_rgb>;
+			};
+		};
+	};
+
 };
 
 &cpu0 {
@@ -156,7 +215,14 @@
 	};
 };
 
-&spi2 {
+/* SPI0 for external gpio pin */
+&spi0 {
+	status = "okay";
+	max-freq = <10000000>;
+};
+
+/* SPI1 for ws2812*/
+&spi1 {
 	status = "okay";
 	max-freq = <10000000>;
 };
@@ -194,6 +260,28 @@
 	status = "okay";
 };
 
+&vop {
+	status = "okay";
+
+	vop_out: port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		vop_out_rgb: endpoint@0 {
+			reg = <0>;
+			remote-endpoint = <&panel_in_rgb>;
+		};
+	};
+};
+
+&pwm1 {
+	status = "okay";
+};
+
+&display_subsystem {
+	status = "okay";
+};
+
 &uart2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart2m0_xfer>;
@@ -223,4 +311,3 @@
 &usb_host_ohci{
 	status = "okay";
 };
-

patch/kernel/archive/rockchip64-6.12/rk3308-internal-rgb-lcdc.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: TheSnowfield <17957399+TheSnowfield@users.noreply.github.com>
+Date: Sat, 22 Feb 2025 01:09:54 +0000
+Subject: rk3308: set pinmux for internal RGB output
+
+Signed-off-by: TheSnowfield <17957399+TheSnowfield@users.noreply.github.com>
+---
+ drivers/gpu/drm/rockchip/rockchip_rgb.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c
+index c677b71ae516..43e9120bbad4 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_rgb.c
++++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c
+@@ -6,10 +6,11 @@
+  */
+
+ #include <linux/component.h>
+ #include <linux/media-bus-format.h>
+ #include <linux/of_graph.h>
++#include <linux/pinctrl/consumer.h>
+
+ #include <drm/display/drm_dp_helper.h>
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_bridge.h>
+ #include <drm/drm_bridge_connector.h>
+@@ -167,10 +168,12 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
+ 		DRM_DEV_ERROR(drm_dev->dev,
+ 			      "failed to attach encoder: %d\n", ret);
+ 		goto err_free_connector;
+ 	}
+
++	pinctrl_pm_select_default_state(dev);
++
+ 	return rgb;
+
+ err_free_connector:
+ 	drm_connector_cleanup(connector);
+ err_free_encoder:
+-- 
+Created with Armbian build tools https://github.com/armbian/build
+