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

rockchip64: fix OrangePi 4 LTS boot with BTF, bump uboot to 2024.10 #7887

Merged
merged 2 commits into from
Feb 28, 2025
Merged

rockchip64: fix OrangePi 4 LTS boot with BTF, bump uboot to 2024.10 #7887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9638d71
bump orangepi4 LTS u-boot to v2024.10
paolosabatino Feb 25, 2025
2ec8eb1
rockchip64: disable DMC for OrangePi 4 LTS, fixes boot with BTF
paolosabatino Feb 27, 2025
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
7 changes: 4 additions & 3 deletions config/boards/orangepi4-lts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
BOARD_NAME="Orange Pi 4 LTS"
BOARDFAMILY="rockchip64" # Used to be rk3399
BOARD_MAINTAINER="paolosabatino"
BOOTCONFIG="orangepi-4-rk3399_defconfig"
BOOTCONFIG="orangepi-rk3399_defconfig"
BOOT_FDT_FILE="rockchip/rk3399-orangepi-4-lts.dtb"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
Expand All @@ -13,8 +13,9 @@ MODULES_EDGE="sprdbt_tty sprdwl_ng"
FULL_DESKTOP="yes"
ASOUND_STATE="asound.state.rk3399"
BOOT_LOGO="desktop"
BOOTBRANCH_BOARD="tag:v2022.04"
BOOTPATCHDIR="u-boot-rockchip64-v2022.04"
BOOTBRANCH_BOARD="tag:v2024.10"
BOOTPATCHDIR="v2024.10"
BOOT_SCENARIO="binman"

function post_family_tweaks_bsp__OPi4lts() {
display_alert "Installing BSP firmware and fixups"
Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
&dmc {
#cooling-cells = <2>; /* min followed by max */

status = "okay";
status = "disabled";
center-supply = <&vdd_log>;
operating-points-v2 = <&dmc_opp_table>;

Expand Down
2 changes: 1 addition & 1 deletion patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@
&dmc {
#cooling-cells = <2>; /* min followed by max */

status = "okay";
status = "disabled";
center-supply = <&vdd_log>;
operating-points-v2 = <&dmc_opp_table>;

Expand Down
16 changes: 16 additions & 0 deletions patch/u-boot/v2024.10/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Alter the orangepi-rk3399_defconfig file to enable "External TPL",
because we want to use the Rockchip ddrbin in place of the u-boot TPL
It has to be set with the env variable ROCKCHIP_TPL when invoking make

diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
index 5dfbdeaf17..167c2b3f60 100644
--- a/configs/orangepi-rk3399_defconfig
+++ b/configs/orangepi-rk3399_defconfig
@@ -8,6 +8,7 @@ CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-orangepi"
CONFIG_DM_RESET=y
CONFIG_ROCKCHIP_RK3399=y
+CONFIG_ROCKCHIP_EXTERNAL_TPL=y
CONFIG_TARGET_EVB_RK3399=y
CONFIG_DEBUG_UART_BASE=0xFF1A0000
CONFIG_DEBUG_UART_CLOCK=24000000
Loading