From 8003d1b7701528d9a05bc124b42fb1cf9c9f2eef Mon Sep 17 00:00:00 2001 From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:48:29 +0200 Subject: [PATCH] rk3588: Integrate `BOOTPATCHDIR` with rk35xx They both use the same U-Boot version now. --- config/sources/families/rk35xx.conf | 2 +- config/sources/families/rockchip-rk3588.conf | 4 ++-- .../0000.patching_config.yaml | 0 .../add-u-boot-pd-negotiation-support.patch | 0 .../board_hinlink-h88k/uboot-hinlink-h88k-config.patch | 0 .../board_rock-5c/reopen_disabled_nodes.patch | 0 .../board_station-m3/uboot-station-m3-config.patch | 0 .../defconfig/armsom-sige7-rk3588_defconfig | 0 .../defconfig/armsom-w3-rk3588_defconfig | 0 .../defconfig/nanopc_cm3588_defconfig | 0 .../defconfig/nanopc_t6_defconfig | 0 .../defconfig/nanopi-r6s-rk3588s_defconfig | 0 .../dt/rk3588-armsom-sige7.dts | 0 .../dt/rk3588-armsom-w3.dts | 0 .../dt/rk3588-nanopc-cm3588.dts | 0 .../dt/rk3588-nanopc-t6.dts | 0 .../dt/rk3588s-nanopi-r6s.dts | 0 17 files changed, 3 insertions(+), 3 deletions(-) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/0000.patching_config.yaml (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/board_armsom-sige7/add-u-boot-pd-negotiation-support.patch (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/board_hinlink-h88k/uboot-hinlink-h88k-config.patch (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/board_rock-5c/reopen_disabled_nodes.patch (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/board_station-m3/uboot-station-m3-config.patch (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/defconfig/armsom-sige7-rk3588_defconfig (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/defconfig/armsom-w3-rk3588_defconfig (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/defconfig/nanopc_cm3588_defconfig (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/defconfig/nanopc_t6_defconfig (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/defconfig/nanopi-r6s-rk3588s_defconfig (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/dt/rk3588-armsom-sige7.dts (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/dt/rk3588-armsom-w3.dts (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/dt/rk3588-nanopc-cm3588.dts (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/dt/rk3588-nanopc-t6.dts (100%) rename patch/u-boot/legacy/{u-boot-radxa-rk3588 => u-boot-radxa-rk35xx}/dt/rk3588s-nanopi-r6s.dts (100%) diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 8cd831687bd0..0f48cb70f333 100644 --- 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 index 77d20ae970fa..29ebc1b8832b 100644 --- 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/patch/u-boot/legacy/u-boot-radxa-rk3588/0000.patching_config.yaml b/patch/u-boot/legacy/u-boot-radxa-rk35xx/0000.patching_config.yaml similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/0000.patching_config.yaml rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/0000.patching_config.yaml diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/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 similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/board_armsom-sige7/add-u-boot-pd-negotiation-support.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige7/add-u-boot-pd-negotiation-support.patch diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/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 similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/board_hinlink-h88k/uboot-hinlink-h88k-config.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_hinlink-h88k/uboot-hinlink-h88k-config.patch diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/board_rock-5c/reopen_disabled_nodes.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_rock-5c/reopen_disabled_nodes.patch similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/board_rock-5c/reopen_disabled_nodes.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_rock-5c/reopen_disabled_nodes.patch diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/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 similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/board_station-m3/uboot-station-m3-config.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_station-m3/uboot-station-m3-config.patch diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/armsom-sige7-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/armsom-sige7-rk3588_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/armsom-w3-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/armsom-w3-rk3588_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopc_cm3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopc_cm3588_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_cm3588_defconfig diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopc_t6_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_t6_defconfig similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopc_t6_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopc_t6_defconfig diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopi-r6s-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/defconfig/nanopi-r6s-rk3588s_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-armsom-sige7.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-sige7.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-armsom-sige7.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-sige7.dts diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-armsom-w3.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-armsom-w3.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-armsom-w3.dts diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-nanopc-cm3588.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-nanopc-cm3588.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-cm3588.dts diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-nanopc-t6.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588-nanopc-t6.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-nanopc-t6.dts diff --git a/patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588s-nanopi-r6s.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-radxa-rk3588/dt/rk3588s-nanopi-r6s.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588s-nanopi-r6s.dts