From 6dd39a2767aa8581ab480b090a13a1e749198e72 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Wed, 27 Dec 2023 21:33:44 +0000 Subject: [PATCH] Fix spl, update rkbin and firmware, fix a few quirks. --- .../quirks/devices/Anbernic RG353P/010-governors | 9 --------- .../hardware/quirks/devices/Anbernic RG503/010-governors | 9 --------- .../hardware/quirks/devices/Powkiddy RGB30/010-governors | 9 --------- .../quirks/devices/Powkiddy RK2023/010-governors | 9 --------- .../Anbernic RG353V => platforms/RK3566}/010-governors | 3 +-- packages/hardware/quirks/platforms/RK3566/050-volume | 2 +- packages/tools/rkbin/package.mk | 2 +- projects/Rockchip/devices/RK3566-X55/options | 6 +++--- projects/Rockchip/devices/RK3566/options | 6 +++--- 9 files changed, 9 insertions(+), 46 deletions(-) delete mode 100755 packages/hardware/quirks/devices/Anbernic RG353P/010-governors delete mode 100755 packages/hardware/quirks/devices/Anbernic RG503/010-governors delete mode 100755 packages/hardware/quirks/devices/Powkiddy RGB30/010-governors delete mode 100755 packages/hardware/quirks/devices/Powkiddy RK2023/010-governors rename packages/hardware/quirks/{devices/Anbernic RG353V => platforms/RK3566}/010-governors (67%) diff --git a/packages/hardware/quirks/devices/Anbernic RG353P/010-governors b/packages/hardware/quirks/devices/Anbernic RG353P/010-governors deleted file mode 100755 index e1a462241..000000000 --- a/packages/hardware/quirks/devices/Anbernic RG353P/010-governors +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -cat </storage/.config/profile.d/010-governors -CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0") -GPU_FREQ="/sys/devices/platform/fde60000.gpu/devfreq/fde60000.gpu" -DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc" -EOF diff --git a/packages/hardware/quirks/devices/Anbernic RG503/010-governors b/packages/hardware/quirks/devices/Anbernic RG503/010-governors deleted file mode 100755 index e1a462241..000000000 --- a/packages/hardware/quirks/devices/Anbernic RG503/010-governors +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -cat </storage/.config/profile.d/010-governors -CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0") -GPU_FREQ="/sys/devices/platform/fde60000.gpu/devfreq/fde60000.gpu" -DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc" -EOF diff --git a/packages/hardware/quirks/devices/Powkiddy RGB30/010-governors b/packages/hardware/quirks/devices/Powkiddy RGB30/010-governors deleted file mode 100755 index e1a462241..000000000 --- a/packages/hardware/quirks/devices/Powkiddy RGB30/010-governors +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -cat </storage/.config/profile.d/010-governors -CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0") -GPU_FREQ="/sys/devices/platform/fde60000.gpu/devfreq/fde60000.gpu" -DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc" -EOF diff --git a/packages/hardware/quirks/devices/Powkiddy RK2023/010-governors b/packages/hardware/quirks/devices/Powkiddy RK2023/010-governors deleted file mode 100755 index e1a462241..000000000 --- a/packages/hardware/quirks/devices/Powkiddy RK2023/010-governors +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -cat </storage/.config/profile.d/010-governors -CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0") -GPU_FREQ="/sys/devices/platform/fde60000.gpu/devfreq/fde60000.gpu" -DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc" -EOF diff --git a/packages/hardware/quirks/devices/Anbernic RG353V/010-governors b/packages/hardware/quirks/platforms/RK3566/010-governors similarity index 67% rename from packages/hardware/quirks/devices/Anbernic RG353V/010-governors rename to packages/hardware/quirks/platforms/RK3566/010-governors index 437984c28..64a383e66 100755 --- a/packages/hardware/quirks/devices/Anbernic RG353V/010-governors +++ b/packages/hardware/quirks/platforms/RK3566/010-governors @@ -5,6 +5,5 @@ cat </storage/.config/profile.d/010-governors # FREQ governors CPU_FREQ=("/sys/devices/system/cpu/cpufreq/policy0") -GPU_FREQ="/sys/devices/platform/ff400000.gpu/devfreq/ff400000.gpu" -DMC_FREQ="/sys/devices/platform/dmc/devfreq/dmc" +GPU_FREQ="$(find /sys/devices/platform/*gpu/devfreq -name '*.gpu')" EOF diff --git a/packages/hardware/quirks/platforms/RK3566/050-volume b/packages/hardware/quirks/platforms/RK3566/050-volume index 2594c1543..df8bd341e 100755 --- a/packages/hardware/quirks/platforms/RK3566/050-volume +++ b/packages/hardware/quirks/platforms/RK3566/050-volume @@ -5,4 +5,4 @@ . /storage/.config/profile.d/001-device_config # RK3566 devices have a master volume attached to card 0 that needs to be set to 100% on startup. -amixer -c 0 set "Master" "100%" +amixer -c 1 set "Master" "100%" diff --git a/packages/tools/rkbin/package.mk b/packages/tools/rkbin/package.mk index 61ee82bcf..d1065f491 100644 --- a/packages/tools/rkbin/package.mk +++ b/packages/tools/rkbin/package.mk @@ -9,5 +9,5 @@ PKG_LONGDESC="rkbin: Rockchip Firmware and Tool Binaries" PKG_TOOLCHAIN="manual" PKG_PATCH_DIRS+="${DEVICE}*" -PKG_VERSION="3aafb4dd13a750ab226604875d7938284d4ee9f1" +PKG_VERSION="5257e54cc6c15fef28c3b73bd95ca1b55cc8c8cd" PKG_URL="${PKG_SITE}.git" diff --git a/projects/Rockchip/devices/RK3566-X55/options b/projects/Rockchip/devices/RK3566-X55/options index bc3aa84e3..38157f65e 100644 --- a/projects/Rockchip/devices/RK3566-X55/options +++ b/projects/Rockchip/devices/RK3566-X55/options @@ -36,9 +36,9 @@ UBOOT_DTB="rk3566" UBOOT_CONFIG="powkiddy-x55-rk3566_defconfig" PKG_SOC="rk3568" - PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3568_ddr_1056MHz_v1.16.bin" - PKG_LOADER="${PKG_RKBIN}/bin/rk35/rk356x_spl_v1.12.bin" - PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.42.elf" + PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin" + PKG_LOADER="spl/u-boot-spl.bin" + PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.43.elf" PKG_LOAD_ADDR="0x0a100000" BOOT_INI=false EXT_LINUX_CONF=true diff --git a/projects/Rockchip/devices/RK3566/options b/projects/Rockchip/devices/RK3566/options index d2016de3d..f87e610a0 100644 --- a/projects/Rockchip/devices/RK3566/options +++ b/projects/Rockchip/devices/RK3566/options @@ -36,9 +36,9 @@ UBOOT_DTB="rk3566" UBOOT_CONFIG="anbernic-rgxx3-rk3566_defconfig" PKG_SOC="rk3568" - PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3568_ddr_1056MHz_v1.16.bin" - PKG_LOADER="${PKG_RKBIN}/bin/rk35/rk356x_spl_v1.12.bin" - PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.42.elf" + PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_ddr_1056MHz_v1.18.bin" + PKG_LOADER="spl/u-boot-spl.bin" + PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.43.elf" PKG_LOAD_ADDR="0x0a100000" BOOT_INI=false EXT_LINUX_CONF=true