Add Kconfig option OF_SYSTEM_SETUP=y to support booting boards with a RK3582 SoC. CPU and GPU cores are failed based on ip-state and policy.
Tested on a ROCK 5C Lite v1.1: cpu-code: 35 82 ip-state: 10 00 00 (otp) ip-state: 30 80 04 (policy) remove cpu-map cluster1 rename cpu-map cluster2 fail rkvdec1 fail rkvenc1 fail cpu cpu@400 fail cpu cpu@500 and on a Radxa E52C: cpu-code: 35 82 ip-state: 00 04 00 (otp) ip-state: c0 84 04 (policy) remove cpu-map cluster2 fail rkvdec1 fail rkvenc1 fail cpu cpu@600 fail cpu cpu@700 Signed-off-by: Jonas Karlman <jo...@kwiboo.se> --- v3: Update commit message to reflect updated policy v2: Mention RK3582 in generic board device tree and documentation --- arch/arm/dts/rk3588-generic.dts | 4 ++-- configs/generic-rk3588_defconfig | 1 + doc/board/rockchip/rockchip.rst | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/rk3588-generic.dts b/arch/arm/dts/rk3588-generic.dts index 6740f9866f17..04144e2ad128 100644 --- a/arch/arm/dts/rk3588-generic.dts +++ b/arch/arm/dts/rk3588-generic.dts @@ -1,13 +1,13 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Minimal generic DT for RK3588S/RK3588 with eMMC, SD-card and USB OTG enabled + * Minimal generic DT for RK3582/RK3588S/RK3588 with eMMC, SD-card and USB OTG enabled */ /dts-v1/; #include "rk3588s.dtsi" / { - model = "Generic RK3588S/RK3588"; + model = "Generic RK3582/RK3588S/RK3588"; compatible = "rockchip,rk3588"; aliases { diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig index dfa8efabe6be..7a8c176912e1 100644 --- a/configs/generic-rk3588_defconfig +++ b/configs/generic-rk3588_defconfig @@ -16,6 +16,7 @@ CONFIG_SPL_FIT_SIGNATURE=y CONFIG_SPL_LOAD_FIT=y # CONFIG_BOOTMETH_VBE is not set CONFIG_LEGACY_IMAGE_FORMAT=y +CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-generic.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_MAX_SIZE=0x40000 diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 7a1385789c20..726eed4ea45b 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -145,7 +145,7 @@ List of mainline supported Rockchip boards: - FriendlyElec NanoPC-T6 (nanopc-t6-rk3588) - FriendlyElec NanoPi R6C (nanopi-r6c-rk3588s) - FriendlyElec NanoPi R6S (nanopi-r6s-rk3588s) - - Generic RK3588S/RK3588 (generic-rk3588) + - Generic RK3582/RK3588S/RK3588 (generic-rk3588) - Hardkernel ODROID-M2 (odroid-m2-rk3588s) - Indiedroid Nova (nova-rk3588s) - Khadas Edge2 (khadas-edge2-rk3588s) -- 2.50.1