wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update firmware, move x55 patches into kernel.

Browse source
This commit is contained in:
fewtarius 2023-05-26 21:39:01 +00:00
parent 7bada0c6f0
commit 0c3a2363e2
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
6 changed files with 8 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/tools/rkbin/package.mk
View file

@ -9,5 +9,5 @@ PKG_LONGDESC="rkbin: Rockchip Firmware and Tool Binaries"
PKG_TOOLCHAIN="manual"
PKG_PATCH_DIRS+="${DEVICE}*"
PKG_VERSION="7f77e406fd1644967301bafb6bec71cf3c6cbb05"
PKG_VERSION="3aafb4dd13a750ab226604875d7938284d4ee9f1"
PKG_URL="${PKG_SITE}.git"

6
projects/Rockchip/devices/RK3566-X55/options
View file

@ -36,9 +36,9 @@
UBOOT_DTB="rk3566"
UBOOT_CONFIG="rk3568_defconfig"
PKG_SOC="rk356x"
PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_ddr_1056MHz_v1.10.bin"
PKG_LOADER="${PKG_RKBIN}/bin/rk35/rk356x_spl_v1.11.bin"
PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.32.elf"
PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_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_LOAD_ADDR="0x0a100000"
BOOT_INI=false
EXT_LINUX_CONF=true

6
projects/Rockchip/devices/RK3566/options
View file

@ -36,9 +36,9 @@
UBOOT_DTB="rk3566"
UBOOT_CONFIG="rk3568_defconfig"
PKG_SOC="rk356x"
PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_ddr_1056MHz_v1.10.bin"
PKG_LOADER="${PKG_RKBIN}/bin/rk35/rk356x_spl_v1.11.bin"
PKG_BL31="${PKG_RKBIN}/bin/rk35/rk3568_bl31_v1.32.elf"
PKG_DATAFILE="${PKG_RKBIN}/bin/rk35/rk3566_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_LOAD_ADDR="0x0a100000"
BOOT_INI=false
EXT_LINUX_CONF=true

2
projects/Rockchip/packages/linux/package.mk
View file

@ -32,7 +32,7 @@ case ${DEVICE} in
;;
*X55)
PKG_URL="${PKG_SITE}/rk3566-x55-kernel.git"
PKG_VERSION="174d5e013"
PKG_VERSION="bc8b671e4"
GET_HANDLER_SUPPORT="git"
PKG_GIT_CLONE_BRANCH="main"
;;

13
projects/Rockchip/packages/linux/patches/RK3566-X55/001-ignore-iodomain-script.patch
View file

@ -1,13 +0,0 @@
diff --git a/scripts/io-domain.sh b/scripts/io-domain.sh
index 040d88580..017b33d43 100755
--- a/scripts/io-domain.sh
+++ b/scripts/io-domain.sh
@@ -2,6 +2,8 @@
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
# Copyright (c) 2021 Rockchip Electronics Co., Ltd.
+exit 0
+
PMUIO2=0
VCCIO1=0
VCCIO3=0

55
projects/Rockchip/packages/linux/patches/RK3566-X55/002-fix-mkmultidtb.patch
View file

@ -1,55 +0,0 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
index 3c184f45d..7ae3aa62c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -3228,7 +3228,7 @@
clock-names = "saradc", "apb_pclk";
resets = <&cru SRST_P_SARADC>;
reset-names = "saradc-apb";
- status = "disabled";
+ status = "okay";
};
mailbox: mailbox@fe780000 {
diff --git a/scripts/mkmultidtb.py b/scripts/mkmultidtb.py
index 81b814acd..e2733eb0e 100755
--- a/scripts/mkmultidtb.py
+++ b/scripts/mkmultidtb.py
@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
# Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd
-#
+# Copyright (C) 2023 Fewtarius
"""
@@ -26,10 +26,13 @@ DTBS['RK3308-EVB'] = OrderedDict([('rk3308-evb-dmic-i2s-v10', '#_saradc_ch3=288'
('rk3308-evb-dmic-pdm-v10', '#_saradc_ch3=1024'),
('rk3308-evb-amic-v10', '#_saradc_ch3=407')])
+DTBS['rk356x'] = OrderedDict([('rk3566-evb2-lp4x-v10-linux', '#_saradc_ch0=511')])
+
+DTBS['rk3588'] = OrderedDict([('rk3588s-orangepi-5', '#_saradc_ch1=001'),
+ ('rk3588-rock-5b', '#_saradc_ch1=002'),
+ ('rk3588s-indiedroid-nova', '#_saradc_ch1=4095')])
+
def main():
- if (len(sys.argv) < 2) or (sys.argv[1] == '-h'):
- print __doc__
- sys.exit(2)
BOARD = sys.argv[1]
TARGET_DTBS = DTBS[BOARD]
@@ -47,8 +50,8 @@ def main():
shutil.copyfile(ori_file, new_file)
target_dtb_list += ' ' + new_file
- print target_dtb_list
- os.system('scripts/resource_tool logo.bmp logo_kernel.bmp ' + target_dtb_list)
+ print (target_dtb_list)
+ os.system('scripts/resource_tool ' + target_dtb_list)
os.system('rm ' + target_dtb_list)
if __name__ == '__main__':