h96max-v56: u-boot: bump to 2025.01

armbian · Jan 25, 2025 · 0041cc7 · 0041cc7
1 parent e0da4a6
commit 0041cc7
Show file tree

Hide file tree

Showing 4 changed files with 363 additions and 16 deletions.
diff --git a/config/boards/h96-tvbox-3566.tvb b/config/boards/h96-tvbox-3566.tvb
@@ -2,29 +2,25 @@
 BOARD_NAME="h96-tvbox-3566"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
-BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
-FULL_DESKTOP="yes"
-BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
+BOOT_LOGO="desktop"
+BOOT_SCENARIO="spl-blobs"
+FULL_DESKTOP="yes"
 IMAGE_PARTITION_TABLE="gpt"
+KERNEL_TARGET="current,edge"
+
+DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.21.bin"
+BL31_BLOB="rk35/rk3568_bl31_v1.44.elf"
 
 # Mainline U-Boot
 function post_family_config__h96_max_use_mainline_uboot() {
 	display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"
-
-	declare -g BOOTCONFIG="generic-rk3568_defconfig"             # Use generic defconfig which should boot all RK3568 boards
-	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
-	declare -g BOOTBRANCH="tag:v2024.07"
-	declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
-	# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency
-
-	declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
-
-	# Disable stuff from rockchip64_common; we're using binman here which does all the work already
+	declare -g BOOTCONFIG="h96max-v56_defconfig"
+	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
+	declare -g BOOTBRANCH="tag:v2025.01"
+	declare -g BOOTPATCHDIR="v2025.01/board_${BOARD}"
+	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB ROCKCHIP_TPL=$RKBIN_DIR/$DDR_BLOB;;u-boot-rockchip.bin"
 	unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
-
-	# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
 	function write_uboot_platform() {
 		dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
 	}

diff --git a/patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts
@@ -26,6 +26,12 @@
 		stdout-path = "serial2:1500000n8";
 	};
 
+	openvfd {
+		compatible = "open,vfd";
+		dev_name = "openvfd";
+		status = "okay";
+	};
+
 	vcc5v0_in: vcc5v0_in {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_in";

diff --git a/patch/kernel/archive/rockchip64-6.6/dt/rk3566-h96-tvbox.dts b/patch/kernel/archive/rockchip64-6.6/dt/rk3566-h96-tvbox.dts
@@ -26,6 +26,12 @@
 		stdout-path = "serial2:1500000n8";
 	};
 
+	openvfd {
+		compatible = "open,vfd";
+		dev_name = "openvfd";
+		status = "okay";
+	};
+
 	vcc5v0_in: vcc5v0_in {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_in";
@@ -58,6 +64,15 @@
 		gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&ir_receiver_pin>;
+		linux,rc-map-name = "rc-h96-max-v56";
+	};
+
+	fddis_dev {
+		compatible = "fddis_dev";
+		fddis_gpio_clk = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
+		fddis_gpio_dat = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>;
+		pinctrl-0 = <&dis_ctl_clk &dis_ctl_dat>;
+		status = "okay";
 	};
 
 	spdif_dit: spdif-dit {
@@ -617,6 +632,16 @@
 			rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>;
 		};
 	};
+
+	fddis_ctr {
+		dis_ctl_clk: dis-ctl-clk {
+			rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+
+		dis_ctl_dat: dis-ctl-dat {
+			rockchip,pins = <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
+	};
 };
 
 &pmu_io_domains {