rk3588: Integrate BOOTPATCHDIR with rk35xx

They both use the same U-Boot version now.
2025-09-24 19:47:06 +07:00 · 2024-07-02 16:48:29 +02:00
parent 91a15ba66c
commit 8003d1b770
17 changed files with 3 additions and 3 deletions
--- a/config/sources/families/rk35xx.conf
+++ b/config/sources/families/rk35xx.conf
@@ -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'
+BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir
 BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx"
 OVERLAY_PREFIX='rk35xx'

--- a/config/sources/families/rockchip-rk3588.conf
+++ b/config/sources/families/rockchip-rk3588.conf
@@ -10,8 +10,8 @@
 source "${BASH_SOURCE%/*}/include/rockchip64_common.inc"

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

 case $BRANCH in
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/0000.patching_config.yaml
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/0000.patching_config.yaml
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige7/add-u-boot-pd-negotiation-support.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige7/add-u-boot-pd-negotiation-support.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_hinlink-h88k/uboot-hinlink-h88k-config.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_hinlink-h88k/uboot-hinlink-h88k-config.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_rock-5c/reopen_disabled_nodes.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_rock-5c/reopen_disabled_nodes.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_station-m3/uboot-station-m3-config.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_station-m3/uboot-station-m3-config.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_t6_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_t6_defconfig
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-sige7.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-sige7.dts
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts