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.

Sign up for GitHub

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

h96max-v56: u-boot: bump to 2025.01 #7746

Merged
merged 1 commit into from
Jan 25, 2025
Merged

h96max-v56: u-boot: bump to 2025.01 #7746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions config/boards/h96-tvbox-3566.tvb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 6 additions & 0 deletions patch/kernel/archive/rockchip64-6.12/dt/rk3566-h96-tvbox.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
25 changes: 25 additions & 0 deletions patch/kernel/archive/rockchip64-6.6/dt/rk3566-h96-tvbox.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading
Loading