diff --git a/config/boards/orangepi4-lts.conf b/config/boards/orangepi4-lts.conf index 2d85eb4137..4807472a30 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 0000000000..6f768ebfc4 --- /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