Skip to content

Commit

Permalink
rk35xx: Bump Radxa vendor U-Boot to branch:next-dev-v2024.03
Browse files Browse the repository at this point in the history
Same version as RK3588, can use the same patch dir.
Fixes not being able to build on Ubuntu Noble (GCC13)
  • Loading branch information
ColorfulRhino authored and igorpecovnik committed Jul 2, 2024
1 parent 7da8ffb commit b358dc7
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 37 deletions.
6 changes: 2 additions & 4 deletions config/sources/families/rk35xx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"

BOOTSOURCE='https://github.com/radxa/u-boot.git'
BOOTBRANCH='branch:stable-4.19-rock3'
BOOTPATCHDIR="legacy"
BOOTBRANCH='branch:next-dev-v2024.03'
BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
OVERLAY_PREFIX='rk35xx'

case $BRANCH in
Expand All @@ -23,7 +23,6 @@ case $BRANCH in
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-5.10-rkr6'
KERNELPATCHDIR='rk35xx-legacy'

;;

vendor)
Expand All @@ -34,7 +33,6 @@ case $BRANCH in
KERNELBRANCH='branch:rk-6.1-rkr1'
KERNELPATCHDIR='rk35xx-vendor-6.1'
;;

esac

prepare_boot_configuration
Expand Down
21 changes: 0 additions & 21 deletions patch/u-boot/legacy/board_rock-3a/add-trust-ini.patch

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <[email protected]>
Date: Wed, 16 Aug 2017 20:17:57 +0300
Subject: [ARCHEOLOGY] [WIP] Initial Rock64 support

> X-Git-Archeology: - Revision 43b3beed8b35cf4ea325068cf5a07dcfd33d98ec: https://github.com/armbian/build/commit/43b3beed8b35cf4ea325068cf5a07dcfd33d98ec
> X-Git-Archeology: Date: Wed, 16 Aug 2017 20:17:57 +0300
> X-Git-Archeology: From: zador-blood-stained <[email protected]>
> X-Git-Archeology: Subject: [WIP] Initial Rock64 support
> X-Git-Archeology:
> X-Git-Archeology: - Revision 9531d1bc7ecd0f468e29e402ba00cbc7b7dd683f: https://github.com/armbian/build/commit/9531d1bc7ecd0f468e29e402ba00cbc7b7dd683f
> X-Git-Archeology: Date: Sat, 20 Jan 2018 18:58:33 +0300
> X-Git-Archeology: From: zador-blood-stained <[email protected]>
> X-Git-Archeology: Subject: Fix rk3328 ATF build configuration
> X-Git-Archeology:
> X-Git-Archeology: - Revision 518ef98107a6705ba6649acdb1481cafedc9766d: https://github.com/armbian/build/commit/518ef98107a6705ba6649acdb1481cafedc9766d
> X-Git-Archeology: Date: Fri, 16 Feb 2018 19:29:22 +0100
> X-Git-Archeology: From: Igor Pecovnik <[email protected]>
> X-Git-Archeology: Subject: RK3399. More fixes but Odroid N1 refuses to boot :( ... ATF builds now (after apt install gcc-arm-none-eabi ?). Tested building/booting with 4-byte skip and u-boot with and without loading address. Enough for today.
> X-Git-Archeology:
> X-Git-Archeology: - Revision 1c9ef0872bfdda69e66de11f0e97b6b43218f73c: https://github.com/armbian/build/commit/1c9ef0872bfdda69e66de11f0e97b6b43218f73c
> X-Git-Archeology: Date: Sun, 24 Nov 2019 22:07:46 +0100
> X-Git-Archeology: From: Piotr Szczepanik <[email protected]>
> X-Git-Archeology: Subject: Multiple bootloader creation options for rk3399 (#1614)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d: https://github.com/armbian/build/commit/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b7d
> X-Git-Archeology: Date: Sun, 03 May 2020 19:15:46 +0200
> X-Git-Archeology: From: Piotr Szczepanik <[email protected]>
> X-Git-Archeology: Subject: Prepare rockchip64 for switch to mainline u-boot and switched ROCK Pi 4 (#1934)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 91f2700eea18d9886fefa69d54bbbef44682083d: https://github.com/armbian/build/commit/91f2700eea18d9886fefa69d54bbbef44682083d
> X-Git-Archeology: Date: Wed, 06 May 2020 23:45:09 +0200
> X-Git-Archeology: From: Piotr Szczepanik <[email protected]>
> X-Git-Archeology: Subject: Fixes and cleanups after rockchip64 preparation for mainline u-boot (#1945)
> X-Git-Archeology:
> X-Git-Archeology: - Revision 0069ad60a6f59028e93cfeebe441538c10738161: https://github.com/armbian/build/commit/0069ad60a6f59028e93cfeebe441538c10738161
> X-Git-Archeology: Date: Wed, 15 Sep 2021 22:08:39 +0200
> X-Git-Archeology: From: Piotr Szczepanik <[email protected]>
> X-Git-Archeology: Subject: Preliminary support for rockchip rk35xx boards (#3111)
> X-Git-Archeology:
> X-Git-Archeology: - Revision de26797423e22d58ec2882d7032c67f77196ecc5: https://github.com/armbian/build/commit/de26797423e22d58ec2882d7032c67f77196ecc5
> X-Git-Archeology: Date: Sun, 06 Nov 2022 20:32:46 +0100
> X-Git-Archeology: From: Igor Pecovnik <[email protected]>
> X-Git-Archeology: Subject: Move all legacy u-boot patches under one general legacy folder (#4386)
---
trust.ini | 15 ++++++++++
1 file changed, 15 insertions(+)

diff --git a/trust.ini b/trust.ini
new file mode 100644
index 000000000000..111111111111
--- /dev/null
+++ b/trust.ini
@@ -0,0 +1,15 @@
+[VERSION]
+MAJOR=1
+MINOR=0
+[BL30_OPTION]
+SEC=0
+[BL31_OPTION]
+SEC=0
+PATH=bl31.elf
+ADDR=0x10000
+[BL32_OPTION]
+SEC=0
+[BL33_OPTION]
+SEC=0
+[OUTPUT]
+PATH=trust.bin
--
Armbian

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <[email protected]>
Date: Mon, 6 Dec 2021 22:36:12 +0100
Subject: Add SoC based image name (rk3566) to rk35xx u-boot
---
tools/rkcommon.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/tools/rkcommon.c b/tools/rkcommon.c
index 111111111111..222222222222 100644
--- a/tools/rkcommon.c
+++ b/tools/rkcommon.c
@@ -140,6 +140,7 @@ static struct spl_info spl_infos[] = {
{ "rk1808", "RK18", 0x200000 - 0x2000, false, RK_HEADER_V1 },
{ "rk3528", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
{ "rk3562", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
+ { "rk3566", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
{ "rk3568", "RK35", 0x10000 - 0x1000, false, RK_HEADER_V2 },
{ "rk3588", "RK35", 0x100000 - 0x1000, false, RK_HEADER_V2 },
};
--
Armbian

0 comments on commit b358dc7

Please sign in to comment.