Skip to content

Commit

Permalink
NanoPi R5C/R5S: Bump U-Boot to mainline 2024.4-rc3
Browse files Browse the repository at this point in the history
- Previously, Kwiboo's U-Boot was used due to his RK3568 patches (https://github.com/Kwiboo/u-boot-rockchip.git)
- Mainline U-Boot 2024.1 has sufficient support for RK3568 merged
- Mainline U-Boot 2024.4 received some improvements for RK3568
  • Loading branch information
ColorfulRhino committed Mar 8, 2024
1 parent 3b4b684 commit 094f396
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 2 additions & 4 deletions config/boards/nanopi-r5c.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ IMAGE_PARTITION_TABLE="gpt"
FULL_DESKTOP="no"
BOOT_LOGO="desktop"

BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's uboot due to his rk3568 work
BOOTBRANCH_BOARD="commit:a6e84f9f5b90ff0fa3ac4e6b7e0d6e2c3ac9bb1b" # specific commit, from "branch:rk3568-2023.10" which is v2023.10-rc2 + kwiboo's patches (including GMAC)
BOOTPATCHDIR="v2023.10"
BOOTBRANCH_BOARD="tag:v2024.04-rc3"
BOOTPATCHDIR="v2024.04"
BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

OVERLAY_PREFIX="rockchip-rk3568"
DEFAULT_OVERLAYS="nanopi-r5c-leds"
Expand Down
6 changes: 2 additions & 4 deletions config/boards/nanopi-r5s.csc
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ IMAGE_PARTITION_TABLE="gpt"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"

BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's u-boot due to his rk3568 work
BOOTBRANCH_BOARD="commit:a6e84f9f5b90ff0fa3ac4e6b7e0d6e2c3ac9bb1b" # specific commit, from "branch:rk3568-2023.10" which is v2023.10-rc2 + kwiboo's patches (including GMAC)
BOOTPATCHDIR="v2023.10"
BOOTBRANCH_BOARD="tag:v2024.04-rc3"
BOOTPATCHDIR="v2024.04"
BOOTCONFIG="nanopi-r5s-rk3568_defconfig"
BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

OVERLAY_PREFIX="rockchip-rk3568"
DEFAULT_OVERLAYS="nanopi-r5s-leds"
Expand Down

0 comments on commit 094f396

Please sign in to comment.