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

Bump radxa rk35xx uboot to next-dev-v2024.10 #7776

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

Bump radxa rk35xx uboot to next-dev-v2024.10 #7776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db9e5d5
u-boot-radxa-rk35xx: bump to next-dev-v2024.10
amazingfate Feb 1, 2025
b755fcb
merge u-boot-armsom-rk3576 to u-boot-radxa-rk35xx
amazingfate Feb 1, 2025
f6e9944
u-boot-radxa-rk35xx: disable optee
amazingfate Feb 2, 2025
ff77010
rk3576: remove unnecessary BL32 from uboot
amazingfate Feb 2, 2025
35d516f
armsom-sige5: add pd negotiation support to uboot
amazingfate Feb 2, 2025
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
10 changes: 0 additions & 10 deletions config/boards/armsom-cm5-io.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
}

function post_family_tweaks__armsom-cm5-io_naming_audios() {
display_alert "$BOARD" "Renaming armsom-cm5 audios" "info"

Expand Down
10 changes: 0 additions & 10 deletions config/boards/armsom-cm5-rpi-cm4-io.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
}

function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info"

Expand Down
10 changes: 0 additions & 10 deletions config/boards/armsom-sige5.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs"
IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER=""

function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git"
declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1"
declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576"
declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
}

function post_family_tweaks__armsom-sige7_naming_audios() {
display_alert "$BOARD" "Renaming armsom-sige7 audios" "info"

Expand Down
1 change: 0 additions & 1 deletion config/sources/families/include/rockchip64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ case "$BOOT_SOC" in
BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
DDR_BLOB="${DDR_BLOB:-"rk35/rk3576_ddr_lp4_2112MHz_lp5_2736MHz_v1.03.bin"}"
BL31_BLOB="${BL31_BLOB:-"rk35/rk3576_bl31_v1.04.elf"}"
BL32_BLOB="${BL32_BLOB:-"rk35/rk3576_bl32_v1.01.bin"}"
;;

rk3588) #CPUMAX undefined?
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rk35xx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"

BOOTSOURCE='https://github.com/radxa/u-boot.git'
BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
BOOTBRANCH='branch:next-dev-v2024.10' # Always use same version as rk3588, they share a patch dir
BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
OVERLAY_PREFIX='rk35xx'

Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rockchip-rk3588.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"

BOOTSOURCE='https://github.com/radxa/u-boot.git'
BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk35xx, they share a patch dir
BOOTBRANCH='branch:next-dev-v2024.10' # Always use same version as rk35xx, they share a patch dir
BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
OVERLAY_PREFIX='rockchip-rk3588'

Expand Down
5 changes: 0 additions & 5 deletions patch/u-boot/legacy/u-boot-armsom-rk3576/0000.patching_config.yaml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...gacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions ...ot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions ...ot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL31-location-via-variable.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ...ot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL32-location-via-variable.patch
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions ...oot/legacy/u-boot-radxa-rk35xx/board_armsom-sige5/add-u-boot-pd-negotiation-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: amazingfate <[email protected]>
Date: Thu, 2 May 2024 01:45:23 +0800
Subject: add u-boot pd negotiation support

---
drivers/power/power_delivery/tcpm.c | 4 ++--
include/configs/rk3576_common.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/power_delivery/tcpm.c b/drivers/power/power_delivery/tcpm.c
index 22334c6230c4..1b94a401836a 100644
--- a/drivers/power/power_delivery/tcpm.c
+++ b/drivers/power/power_delivery/tcpm.c
@@ -1390,8 +1390,8 @@ static void tcpm_pd_rx_handler(struct tcpm_port *port,
*/
if (!!(le16_to_cpu(msg->header) & PD_HEADER_DATA_ROLE) ==
(port->data_role == TYPEC_HOST)) {
- printf("Data role mismatch, initiating error recovery\n");
- tcpm_set_state(port, ERROR_RECOVERY, 0);
+ printf("Data role mismatch, hard resetting...\n");
+ tcpm_set_state(port, HARD_RESET_SEND, 0);
} else {
if (cnt)
tcpm_pd_data_request(port, msg);
diff --git a/include/configs/rk3576_common.h b/include/configs/rk3576_common.h
index 549a2583c3ad..448ae2ec6ef0 100644
--- a/include/configs/rk3576_common.h
+++ b/include/configs/rk3576_common.h
@@ -96,7 +96,7 @@
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1

-#define CONFIG_PREBOOT
+#define CONFIG_PREBOOT "charge_pd"
#define CONFIG_LIB_HW_RAND

#endif
--
Armbian

2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-aim7-io-rk3588_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions .../defconfig/armsom-cm5-io-rk3576_defconfig → .../defconfig/armsom-cm5-io-rk3576_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-cm5-io.dtb"
2 changes: 0 additions & 2 deletions ...ig/armsom-cm5-rpi-cm4-io-rk3576_defconfig → ...ig/armsom-cm5-rpi-cm4-io-rk3576_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb"
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige3-rk3568_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_CMD_CHARGE_DISPLAY=y
CONFIG_DM_CHARGE_DISPLAY=y
CONFIG_CMD_PMIC=y
Expand Down
5 changes: 3 additions & 2 deletions ...6/defconfig/armsom-sige5-rk3576_defconfig → ...x/defconfig/armsom-sige5-rk3576_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y
CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-sige5.dtb"
CONFIG_CMD_CHARGE_DISPLAY=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_CMD_CHARGE_DISPLAY=y
CONFIG_DM_CHARGE_DISPLAY=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/hinlink_rk3528_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
#CONFIG_OPTEE_CLIENT=y
#CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mixtile-edge2-rk3568_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,6 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_CMD_CHARGE_DISPLAY=y
CONFIG_DM_CHARGE_DISPLAY=y
CONFIG_CMD_PMIC=y
Expand Down
3 changes: 0 additions & 3 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-max-rk3588_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,3 @@ CONFIG_LIBATA=y
CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-plus-rk3588_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,3 @@ CONFIG_LIBATA=y
CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,5 +250,3 @@ CONFIG_LIBATA=y
CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-sata-rk3588s_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,5 +250,3 @@ CONFIG_LIBATA=y
CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5b-rk3588s_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,5 +250,3 @@ CONFIG_LIBATA=y
CONFIG_SCSI_AHCI=y
CONFIG_SCSI=y
CONFIG_MTD_BLK_U_BOOT_OFFS=0x400
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/radxa_e20c_rk3528_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,5 +218,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
2 changes: 0 additions & 2 deletions patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,5 +210,3 @@ CONFIG_AVB_LIBAVB_AB=y
CONFIG_AVB_LIBAVB_ATX=y
CONFIG_AVB_LIBAVB_USER=y
CONFIG_RK_AVB_LIBAVB_USER=y
CONFIG_OPTEE_CLIENT=y
CONFIG_OPTEE_V2=y
0 ...armsom-rk3576/dt/rk3576-armsom-cm5-io.dts → ...-radxa-rk35xx/dt/rk3576-armsom-cm5-io.dts
View file
Open in desktop
File renamed without changes.
0 ...-armsom-rk3576/dt/rk3576-armsom-sige5.dts → ...t-radxa-rk35xx/dt/rk3576-armsom-sige5.dts
View file
Open in desktop
File renamed without changes.
Loading