rk3588: Integrate BOOTPATCHDIR with rk35xx

They both use the same U-Boot version now.
armbian · Jul 2, 2024 · 8003d1b · 8003d1b
1 parent 91a15ba
commit 8003d1b
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 3 deletions.
diff --git 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'
 

diff --git 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

diff --git a/...ot-radxa-rk3588/0000.patching_config.yaml → ...ot-radxa-rk35xx/0000.patching_config.yaml b/...ot-radxa-rk3588/0000.patching_config.yaml → ...ot-radxa-rk35xx/0000.patching_config.yaml
diff --git a/...7/add-u-boot-pd-negotiation-support.patch → ...7/add-u-boot-pd-negotiation-support.patch b/...7/add-u-boot-pd-negotiation-support.patch → ...7/add-u-boot-pd-negotiation-support.patch
diff --git a/...link-h88k/uboot-hinlink-h88k-config.patch → ...link-h88k/uboot-hinlink-h88k-config.patch b/...link-h88k/uboot-hinlink-h88k-config.patch → ...link-h88k/uboot-hinlink-h88k-config.patch
diff --git a/...board_rock-5c/reopen_disabled_nodes.patch → ...board_rock-5c/reopen_disabled_nodes.patch b/...board_rock-5c/reopen_disabled_nodes.patch → ...board_rock-5c/reopen_disabled_nodes.patch
diff --git a/..._station-m3/uboot-station-m3-config.patch → ..._station-m3/uboot-station-m3-config.patch b/..._station-m3/uboot-station-m3-config.patch → ..._station-m3/uboot-station-m3-config.patch
diff --git a/...8/defconfig/armsom-sige7-rk3588_defconfig → ...x/defconfig/armsom-sige7-rk3588_defconfig b/...8/defconfig/armsom-sige7-rk3588_defconfig → ...x/defconfig/armsom-sige7-rk3588_defconfig
diff --git a/...3588/defconfig/armsom-w3-rk3588_defconfig → ...35xx/defconfig/armsom-w3-rk3588_defconfig b/...3588/defconfig/armsom-w3-rk3588_defconfig → ...35xx/defconfig/armsom-w3-rk3588_defconfig
diff --git a/...-rk3588/defconfig/nanopc_cm3588_defconfig → ...-rk35xx/defconfig/nanopc_cm3588_defconfig b/...-rk3588/defconfig/nanopc_cm3588_defconfig → ...-rk35xx/defconfig/nanopc_cm3588_defconfig
diff --git a/...adxa-rk3588/defconfig/nanopc_t6_defconfig → ...adxa-rk35xx/defconfig/nanopc_t6_defconfig b/...adxa-rk3588/defconfig/nanopc_t6_defconfig → ...adxa-rk35xx/defconfig/nanopc_t6_defconfig
diff --git a/...88/defconfig/nanopi-r6s-rk3588s_defconfig → ...xx/defconfig/nanopi-r6s-rk3588s_defconfig b/...88/defconfig/nanopi-r6s-rk3588s_defconfig → ...xx/defconfig/nanopi-r6s-rk3588s_defconfig
diff --git a/...t-radxa-rk3588/dt/rk3588-armsom-sige7.dts → ...t-radxa-rk35xx/dt/rk3588-armsom-sige7.dts b/...t-radxa-rk3588/dt/rk3588-armsom-sige7.dts → ...t-radxa-rk35xx/dt/rk3588-armsom-sige7.dts
diff --git a/...boot-radxa-rk3588/dt/rk3588-armsom-w3.dts → ...boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts b/...boot-radxa-rk3588/dt/rk3588-armsom-w3.dts → ...boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts
diff --git a/...-radxa-rk3588/dt/rk3588-nanopc-cm3588.dts → ...-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts b/...-radxa-rk3588/dt/rk3588-nanopc-cm3588.dts → ...-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts
diff --git a/...boot-radxa-rk3588/dt/rk3588-nanopc-t6.dts → ...boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts b/...boot-radxa-rk3588/dt/rk3588-nanopc-t6.dts → ...boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts
diff --git a/...ot-radxa-rk3588/dt/rk3588s-nanopi-r6s.dts → ...ot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts b/...ot-radxa-rk3588/dt/rk3588s-nanopi-r6s.dts → ...ot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts