Skip to content

Commit

Permalink
Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (armbian#6855)
Browse files Browse the repository at this point in the history
* bump rk322x-box and rk3318-box to u-boot v2024.07-rc5

 * leverage uboot relocation for rk3328
 * rework hdmi/vop patches
 * fix some usb issues on rk3318-box

* cleanup rk322x-box and rk3318-box old uboot patches
  • Loading branch information
paolosabatino authored Jul 2, 2024
1 parent 8003d1b commit 7876017
Showing 44 changed files with 849 additions and 5,625 deletions.
4 changes: 2 additions & 2 deletions config/boards/rk3318-box.tvb
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ BOOT_SCENARIO="tpl-blob-atf-mainline"
DDR_BLOB="rk33/rk3318_ddr_333Mhz_v1.16.bin"
BOOT_SOC="rk3328"

BOOTBRANCH_BOARD="tag:v2024.01"
BOOTPATCHDIR="v2024.01"
BOOTBRANCH_BOARD="tag:v2024.07-rc5"
BOOTPATCHDIR="v2024.07"

enable_extension xorg-lima-serverflags

4 changes: 2 additions & 2 deletions config/sources/families/rockchip.conf
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ elif [[ "$BOOT_SOC" == "rk322x" ]]; then
OVERLAY_PREFIX='rk322x'
UBOOT_TARGET_MAP="ROCKCHIP_TPL=$SRC/packages/blobs/rockchip/rk322x_ddr_333MHz_v1.11_2t.bin TEE=$SRC/packages/blobs/rockchip/rk322x_tee.bin;;u-boot-rk322x-with-spl.bin"

BOOTBRANCH='tag:v2024.01'
BOOTPATCHDIR='v2024.01'
BOOTBRANCH='tag:v2024.07-rc5'
BOOTPATCHDIR='v2024.07'

fi

230 changes: 0 additions & 230 deletions patch/u-boot/v2022.04/board_rk322x-box/dtsi-add-generic-tvbox.patch

This file was deleted.

117 changes: 0 additions & 117 deletions patch/u-boot/v2022.04/board_rk322x-box/rk322x-box-add-defconfig.patch

This file was deleted.

Loading

0 comments on commit 7876017

Please sign in to comment.