From 9638d71dd74c24e89370879a26f0d35bbec3c060 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Tue, 25 Feb 2025 19:42:47 +0100 Subject: [PATCH 1/2] bump orangepi4 LTS u-boot to v2024.10 --- config/boards/orangepi4-lts.conf | 7 ++++--- .../board-orangepi4-rockchip-tpl.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 patch/u-boot/v2024.10/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch diff --git a/config/boards/orangepi4-lts.conf b/config/boards/orangepi4-lts.conf index 2d85eb413784..4807472a30aa 100644 --- a/config/boards/orangepi4-lts.conf +++ b/config/boards/orangepi4-lts.conf @@ -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" @@ -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" diff --git a/patch/u-boot/v2024.10/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch b/patch/u-boot/v2024.10/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch new file mode 100644 index 000000000000..6f768ebfc4f4 --- /dev/null +++ b/patch/u-boot/v2024.10/board_orangepi4-lts/board-orangepi4-rockchip-tpl.patch @@ -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 From 2ec8eb124080c02329e7edfe5965c152a9ebab95 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 27 Feb 2025 21:50:33 +0100 Subject: [PATCH 2/2] rockchip64: disable DMC for OrangePi 4 LTS, fixes boot with BTF --- .../kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts | 2 +- .../kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts index d6ed638845b3..87c0953fdef6 100644 --- a/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts +++ b/patch/kernel/archive/rockchip64-6.12/dt/rk3399-orangepi-4-lts.dts @@ -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>; diff --git a/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts index 77c1bbcfffde..c799404576de 100644 --- a/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts +++ b/patch/kernel/archive/rockchip64-6.14/dt/rk3399-orangepi-4-lts.dts @@ -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>;