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

rockchip-rk3588: rock-5b current, edge: u-boot: bump to mainline 2024.10-rc3 #7135

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

rockchip-rk3588: rock-5b current, edge: u-boot: bump to mainline 2024.10-rc3 #7135

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c955695
rockchip-rk3588: rock-5b current, edge: u-boot: bump to mainline 2024…
alexl83 Aug 24, 2024
f3465d3
comment an actual comment (prepend with #)
alexl83 Aug 25, 2024
875771a
Merge branch 'main' into rk3588-rock-5b-mainline_bump-uboot
alexl83 Aug 29, 2024
ff324a6
Merge branch 'main' into rk3588-rock-5b-mainline_bump-uboot
alexl83 Sep 8, 2024
4d4d95c
Merge branch 'main' into rk3588-rock-5b-mainline_bump-uboot
alexl83 Sep 14, 2024
d8f24ef
Merge branch 'main' into rk3588-rock-5b-mainline_bump-uboot
alexl83 Sep 15, 2024
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
Prev Previous commit
Next Next commit
comment an actual comment (prepend with #)
  • Loading branch information
@alexl83
alexl83 committed Aug 25, 2024
commit f3465d3b98b5a7d63c4c4e78f25497cdda50aaf8
6 changes: 3 additions & 3 deletions config/boards/rock-5b.conf
View file
Original file line number Diff line number Diff line change
@@ -27,13 +27,13 @@ function post_family_tweaks__rock5b_naming_audios() {
return 0
}

Mainline u-boot tree
# Mainline u-boot tree
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better idea to add function without branch notation and use if-return in order to avoid code duplication

function post_family_config_branch_edge__rock-5b_use_mainline_uboot() {
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTCONFIG="rock5b-rk3588_defconfig" # override the default for the board/family
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️Mainline tree
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
declare -g BOOTBRANCH="tag:v2024.10-rc3" # commit:d11a60610e17373331ad17b6c5c31735cf9fffa8 as of 2024-08-20
declare -g BOOTPATCHDIR="v2024.10-rock5b-radxa" # empty; defconfig changes are done in hook below
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use BOOTPATCHDIR="v2024.10", since $BOOTBRANCH/board_$BOARD gets applied automatically by the patcher for the specific $BOARD ( in this case "v2024.10/board_rock-5b")

declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
@@ -56,7 +56,7 @@ function post_family_config_branch_current__rock-5b_use_mainline_uboot() {

declare -g BOOTCONFIG="rock5b-rk3588_defconfig" # override the default for the board/family
declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline tree
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ ainline tree
declare -g BOOTBRANCH="tag:v2024.10-rc3" # commit:d11a60610e17373331ad17b6c5c31735cf9fffa8 as of 2024-08-20
declare -g BOOTPATCHDIR="v2024.10-rock5b-radxa" # empty; defconfig changes are done in hook below
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory