date:20231005

[yocto] [layerindex-web 3/3] requirements: bump django-simple-captcha to 0.5.20

2023-10-05 Thread Tim Orling

https://raw.githubusercontent.com/mbi/django-simple-captcha/master/CHANGES

Version 0.5.20
--
* Still support Django 3.2 (#222, thanks @petrklus)

Version 0.5.19
--
* SECURITY ISSUE: reset the random seed after an image was generated (#221, 
thanks @ibuler)

Version 0.5.18
--
* Fix some typos in documentation (#210, thanks @stweil)
* Test against Django 4.2
* Stopped testing Django < 3.2
* BaseCaptchaTextInput should set autocomplete=off on the hashkey HiddenInput 
(#201, thanks @eerotal)
* Test against Django 4.2a
* Fix some deprecation warnings in Pillow 9.2+
* Removed old unused conditional imports
* Format code with pre-commit and black

Version 0.5.17
--
* English translation created from Spanish ones (#209, thanks @tpazderka)

Version 0.5.16
--
* Adds a migration missing from 0.5.15 (#208, thanks @atodorov)

Version 0.5.15
--
* Updated test matrix, drop tests against Python3.6, test against Python3.9
* Remove dependency on six
* Test against Django 4.0a1
* Test with Python 3.10 (Django 3.2 and Django 4.0)
* Remove warning for django 3.2 (#206, thanks @MiStErLu)

Signed-off-by: Tim Orling 
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5cc07a4..18835b7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ django-ranged-response==0.2.0
 django-registration==3.2
 django-reversion==4.0.1
 django-reversion-compare==0.14.1
-django-simple-captcha==0.5.14
+django-simple-captcha==0.5.20
 djangorestframework==3.13.1
 gitdb==4.0.9
 GitPython==3.1.37
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61257): https://lists.yoctoproject.org/g/yocto/message/61257
Mute This Topic: https://lists.yoctoproject.org/mt/101790863/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[yocto] [layerindex-web 2/3] dockersetup.py: databasefile zstd compression

2023-10-05 Thread Tim Orling

zstd compression and decompression are significantly faster than gzip.
zstd is also "splittable" and is streaming/real-time friendly.

Signed-off-by: Tim Orling 
---
 dockersetup.py | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/dockersetup.py b/dockersetup.py
index 6a0ab67..d6e8f33 100755
--- a/dockersetup.py
+++ b/dockersetup.py
@@ -4,6 +4,8 @@
 #
 # Copyright (C) 2018 Intel Corporation
 # Author: Amber Elliot 
+# Copyright (C) 2023 Konsulko Group
+# Author: Tim Orling 
 #
 # Licensed under the MIT license, see COPYING.MIT for details
 #
@@ -52,7 +54,7 @@ def get_args():
 parser.add_argument('-s', '--https-proxy', type=str, help='https proxy in 
the format http://', default=default_https_proxy, required=False)
 parser.add_argument('-S', '--socks-proxy', type=str, help='socks proxy in 
the format socks://myproxy:port>', default=default_socks_proxy, required=False)
 parser.add_argument('-N', '--no-proxy', type=str, help='Comma-separated 
list of hosts that should not be connected to via the proxy', 
default=default_no_proxy, required=False)
-parser.add_argument('-d', '--databasefile', type=str, help='Location of 
your database file to import. Must be a .sql or .sql.gz file.', required=False)
+parser.add_argument('-d', '--databasefile', type=str, help='Location of 
your database file to import. Must be a .sql, .sql.gz or .sql.zstd file.', 
required=False)
 parser.add_argument('-e', '--email-host', type=str, help='Email host for 
sending messages (optionally with :port if not 25)', required=False)
 parser.add_argument('--email-user', type=str, help='User name to use when 
connecting to email host', required=False)
 parser.add_argument('--email-password', type=str, help='Password to use 
when connecting to email host', required=False)
@@ -804,9 +806,15 @@ while True:
 if not args.update:
 # Import the user's supplied data
 if args.databasefile:
-return_code = subprocess.call("gunzip -t %s > /dev/null 2>&1" % 
quote(args.databasefile), shell=True)
-if return_code == 0:
-catcmd = 'zcat'
+filename, file_extension = os.path.splitext(args.databasefile)
+if file_extension == ".zstd":
+return_code = subprocess.call("zstd -t %s > /dev/null 2>&1" % 
quote(args.databasefile), shell=True)
+if return_code == 0:
+catcmd = 'zstdcat'
+elif file_extension == ".gz":
+return_code = subprocess.call("gunzip -t %s > /dev/null 2>&1" % 
quote(args.databasefile), shell=True)
+if return_code == 0:
+catcmd = 'zcat'
 else:
 catcmd = 'cat'
 env = os.environ.copy()
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61256): https://lists.yoctoproject.org/g/yocto/message/61256
Mute This Topic: https://lists.yoctoproject.org/mt/101790862/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[yocto] [layerindex-web 1/3] build(deps): bump pillow from 9.3.0 to 10.0.1

2023-10-05 Thread Tim Orling

From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.3.0...10.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 
Signed-off-by: Tim Orling 
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5bc4659..5cc07a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ gitdb==4.0.9
 GitPython==3.1.37
 kombu==5.2.3
 mysqlclient==2.1.0
-Pillow==9.3.0
+Pillow==10.0.1
 pytz==2021.3
 six==1.16.0
 smmap==5.0.0
-- 
2.34.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61255): https://lists.yoctoproject.org/g/yocto/message/61255
Mute This Topic: https://lists.yoctoproject.org/mt/101790860/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[yocto-announce] [ANNOUNCEMENT] Yocto Project 4.0.13 is Released

2023-10-05 Thread Lee Chee Yang

Hi

We are pleased to announce the Yocto Project 4.0.13 Release is now available 
for download.

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2

A gpg signed version of these release notes is available at:

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/RELEASENOTES

Full Test Report:

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/testreport.txt

Thank you for everyone's contributions to this release.

Chee Yang
chee.yang@intel.com
Yocto Project Build and Release


- --
yocto-4.0.13 Release Notes
- --


- --
Repositories/Downloads
- --

Repository Name: poky
Repository Location: https://git.yoctoproject.org/poky
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: e51bf557f596c4da38789a948a3228ba11455e3c
Release Artefact: poky-e51bf557f596c4da38789a948a3228ba11455e3c
sha: afddadb367a90154751f04993077bceffdc1413f9ba9b8c03acb487d0437286e
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2

Repository Name: openembedded-core
Repository Location: https://git.openembedded.org/openembedded-core
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: d90e4d5e3cca9cffe8f60841afc63667a9ac39fa
Release Artefact: oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa
sha: 56e3bdac81b3628e74dfef2132a54be4db7d87373139a00ed64f5c9a354d716a
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa.tar.bz2

Repository Name: meta-mingw
Repository Location: https://git.yoctoproject.org/meta-mingw
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: a90614a6498c3345704e9611f2842eb933dc51c1
Release Artefact: meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1
sha: 49f9900bfbbc1c68136f8115b314e95d0b7f6be75edf36a75d9bcd1cca7c6302
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2

Repository Name: meta-gplv2
Repository Location: https://git.yoctoproject.org/meta-gplv2
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2

Repository Name: bitbake
Repository Location: https://git.openembedded.org/bitbake
Branch: 2.0
Tag: yocto-4.0.13
Git Revision: 41b6684489d0261753344956042be2cc4adb0159
Release Artefact: bitbake-41b6684489d0261753344956042be2cc4adb0159
sha: efa2b1c4d0be115ed3960750d1e4ed958771b2db6d7baee2d13ad386589376e8
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/bitbake-41b6684489d0261753344956042be2cc4adb0159.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/bitbake-41b6684489d0261753344956042be2cc4adb0159.tar.bz2

Repository Name: yocto-docs
Repository Location: https://git.yoctoproject.org/yocto-docs
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: 8f02741de867125f11a37822b2d206be180d4ee3


- ---
Contributors
- ---
Abe Kohandel
Adrian Freihofer
Alberto Planas
Alex Kiernan
Alexander Kanavin
Alexis LothorÃ©
Anuj Mittal
Archana Polampalli
Ashish Sharma
BELOUARGA Mohamed
Bruce Ashfield
Changqing Li
Dmitry Baryshkov
Enrico Scholz
Etienne Cordonnier
Hitendra Prajapati
Julien Stephan
Kai Kang
Khem Raj
Lee Chee Yang
Marek Vasut
Markus Niebel
Martin Jansa
Meenali Gupta
Michael Halstead
Michael Opdenacker
Narpat Mali
Ovidiu Panait
Pavel Zhukov
Peter Marko
Peter Suti
Poonam Jadhav
Richard Purdie
Roland Hieber
Ross Burton
Sanjana
Siddharth Doshi
Soumya Sambu
Staffan RydÃ©n
Steve Sakoman
Trevor Gamblin
Vijay Anusuri
Vivek Kumbhar
Wang Mingyu
Yogita Urade


- ---
Known Issues
- ---
N/A


- ---
Security Fixes
- ---
bind: Fix CVE-2023-2829
binutils: Fix CVE-2022-48065
busybox: Fix CVE-2022-48174
cups: Fix CVE-2023-32360
curl: Fix CVE-2023-32001
dmidecode: Fix CVE-2023-30630
dropbear: Fix CVE-2023-36328
ffmpeg: Ignored CVE-2023-39018
file: Fix CVE-2022-48554
flac: Fix CVE-2020-22219
gcc: Fix CVE-2023-4039
gdb: Fix CVE-2023-39128

[yocto] [ANNOUNCEMENT] Yocto Project 4.0.13 is Released

2023-10-05 Thread Lee Chee Yang

Hi

We are pleased to announce the Yocto Project 4.0.13 Release is now available 
for download.

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2

A gpg signed version of these release notes is available at:

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/RELEASENOTES

Full Test Report:

http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/testreport.txt

Thank you for everyone's contributions to this release.

Chee Yang
chee.yang@intel.com
Yocto Project Build and Release


- --
yocto-4.0.13 Release Notes
- --


- --
Repositories/Downloads
- --

Repository Name: poky
Repository Location: https://git.yoctoproject.org/poky
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: e51bf557f596c4da38789a948a3228ba11455e3c
Release Artefact: poky-e51bf557f596c4da38789a948a3228ba11455e3c
sha: afddadb367a90154751f04993077bceffdc1413f9ba9b8c03acb487d0437286e
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/poky-e51bf557f596c4da38789a948a3228ba11455e3c.tar.bz2

Repository Name: openembedded-core
Repository Location: https://git.openembedded.org/openembedded-core
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: d90e4d5e3cca9cffe8f60841afc63667a9ac39fa
Release Artefact: oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa
sha: 56e3bdac81b3628e74dfef2132a54be4db7d87373139a00ed64f5c9a354d716a
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/oecore-d90e4d5e3cca9cffe8f60841afc63667a9ac39fa.tar.bz2

Repository Name: meta-mingw
Repository Location: https://git.yoctoproject.org/meta-mingw
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: a90614a6498c3345704e9611f2842eb933dc51c1
Release Artefact: meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1
sha: 49f9900bfbbc1c68136f8115b314e95d0b7f6be75edf36a75d9bcd1cca7c6302
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/meta-mingw-a90614a6498c3345704e9611f2842eb933dc51c1.tar.bz2

Repository Name: meta-gplv2
Repository Location: https://git.yoctoproject.org/meta-gplv2
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
Release Artefact: meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a
sha: c386f59f8a672747dc3d0be1d4234b6039273d0e57933eb87caa20f56b9cca6d
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/meta-gplv2-d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a.tar.bz2

Repository Name: bitbake
Repository Location: https://git.openembedded.org/bitbake
Branch: 2.0
Tag: yocto-4.0.13
Git Revision: 41b6684489d0261753344956042be2cc4adb0159
Release Artefact: bitbake-41b6684489d0261753344956042be2cc4adb0159
sha: efa2b1c4d0be115ed3960750d1e4ed958771b2db6d7baee2d13ad386589376e8
Download Locations:
http://downloads.yoctoproject.org/releases/yocto/yocto-4.0.13/bitbake-41b6684489d0261753344956042be2cc4adb0159.tar.bz2
http://mirrors.kernel.org/yocto/yocto/yocto-4.0.13/bitbake-41b6684489d0261753344956042be2cc4adb0159.tar.bz2

Repository Name: yocto-docs
Repository Location: https://git.yoctoproject.org/yocto-docs
Branch: kirkstone
Tag: yocto-4.0.13
Git Revision: 8f02741de867125f11a37822b2d206be180d4ee3


- ---
Contributors
- ---
Abe Kohandel
Adrian Freihofer
Alberto Planas
Alex Kiernan
Alexander Kanavin
Alexis LothorÃ©
Anuj Mittal
Archana Polampalli
Ashish Sharma
BELOUARGA Mohamed
Bruce Ashfield
Changqing Li
Dmitry Baryshkov
Enrico Scholz
Etienne Cordonnier
Hitendra Prajapati
Julien Stephan
Kai Kang
Khem Raj
Lee Chee Yang
Marek Vasut
Markus Niebel
Martin Jansa
Meenali Gupta
Michael Halstead
Michael Opdenacker
Narpat Mali
Ovidiu Panait
Pavel Zhukov
Peter Marko
Peter Suti
Poonam Jadhav
Richard Purdie
Roland Hieber
Ross Burton
Sanjana
Siddharth Doshi
Soumya Sambu
Staffan RydÃ©n
Steve Sakoman
Trevor Gamblin
Vijay Anusuri
Vivek Kumbhar
Wang Mingyu
Yogita Urade


- ---
Known Issues
- ---
N/A


- ---
Security Fixes
- ---
bind: Fix CVE-2023-2829
binutils: Fix CVE-2022-48065
busybox: Fix CVE-2022-48174
cups: Fix CVE-2023-32360
curl: Fix CVE-2023-32001
dmidecode: Fix CVE-2023-30630
dropbear: Fix CVE-2023-36328
ffmpeg: Ignored CVE-2023-39018
file: Fix CVE-2022-48554
flac: Fix CVE-2020-22219
gcc: Fix CVE-2023-4039
gdb: Fix CVE-2023-39128

Re: [yocto] [meta-rockchip] [PATCH] Add support for the Radxa Rock-3a based on rk3568

2023-10-05 Thread Trevor Woerner

On Fri 2023-10-06 @ 09:45:44 AM, anthony.t.dav...@gmail.com wrote:
> From: Anthony Davies 
> 
> Added appropriate inc files and machine.conf
> 
> Modified rockchip-rkbin_git.bb to allow machine overrides on
> do_deploy.
> 
> I have tested this patch on my own rock-3a

This commit message is lacking. Take a look at some of the other commits
adding new machines and try to follow suit.

> 
> Signed-off-by: Anthony Davies 
> ---
>  README  |  1 +
>  conf/machine/include/rk3568.inc | 17 ++
>  conf/machine/rock-3a.conf   | 12 +++
>  recipes-bsp/rkbin/rockchip-rkbin_git.bb | 16 -
>  recipes-bsp/u-boot/u-boot%.bbappend | 43 -
>  5 files changed, 73 insertions(+), 16 deletions(-)
>  create mode 100644 conf/machine/include/rk3568.inc
>  create mode 100644 conf/machine/rock-3a.conf
> 
> diff --git a/README b/README
> index 8104474..aa1c834 100644
> --- a/README
> +++ b/README
> @@ -30,6 +30,7 @@ Status of supported boards:
>   vyasa-rk3288
>   firefly-rk3288
>   nanopi-r4s
> +rock-3a
>   rock-5b
>   nanopi-r2s
>   builds:
> diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc
> new file mode 100644
> index 000..5382b58
> --- /dev/null
> +++ b/conf/machine/include/rk3568.inc
> @@ -0,0 +1,17 @@
> +MACHINEOVERRIDES =. "rk3568:"
> +DEFAULTTUNE ?= "cortexa55"
> +
> +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
> +require conf/machine/include/rockchip-defaults.inc
> +require conf/machine/include/rockchip-wic.inc
> +
> +KBUILD_DEFCONFIG ?= "defconfig"
> +KERNEL_FEATURES:append:rk3568 = " 
> bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
> +KERNEL_CLASSES ??= "kernel-fitimage"
> +KERNEL_IMAGETYPE ??= "fitImage"
> +
> +PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
> +PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
> +
> +UBOOT_SUFFIX ?= "itb"
> +UBOOT_ENTRYPOINT ?= "0x0600"
> diff --git a/conf/machine/rock-3a.conf b/conf/machine/rock-3a.conf
> new file mode 100644
> index 000..452bde0
> --- /dev/null
> +++ b/conf/machine/rock-3a.conf
> @@ -0,0 +1,12 @@
> +#@TYPE: Machine
> +#@NAME: Radxa Rock3a
> +#@DESCRIPTION: ROCK3 is a series of Rockchip RK3566/RK3568 based SBC(Single 
> Board Computer) and Compute Module by Radxa.
> +#https://wiki.radxa.com/Rock3
> +
> +require conf/machine/include/rk3568.inc
> +
> +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
> +KERNEL_DEVICETREE = "rockchip/rk3568-rock-3a.dtb"
> +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
> +
> +UBOOT_MACHINE = "rock-3a-rk3568_defconfig"
> diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb 
> b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
> index 7fefb01..273f394 100644
> --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
> +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
> @@ -14,6 +14,7 @@ S = "${WORKDIR}/git"
>  
>  COMPATIBLE_MACHINE = ""
>  COMPATIBLE_MACHINE:rk3588s = "rk3588s"
> +COMPATIBLE_MACHINE:rk3568 = "rk3568"
>  
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>  
> @@ -25,7 +26,16 @@ do_install() {
>  PACKAGES = "${PN}"
>  ALLOW_EMPTY:${PN} = "1"
>  
> -do_deploy() {
> +do_deploy:rk3568() {
> + # Prebuilt TF-A
> + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf 
> ${DEPLOYDIR}/bl31-rk3568.elf
> + # Prebuilt OPTEE-OS
> + install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin 
> ${DEPLOYDIR}/tee-rk3568.bin
> + # Prebuilt U-Boot TPL (DDR init)
> + install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.18.bin 
> ${DEPLOYDIR}/ddr-rk3568.bin
> +}
> +
> +do_deploy:rk3588s() {
>   # Prebuilt TF-A
>   install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf 
> ${DEPLOYDIR}/bl31-rk3588.elf
>   # Prebuilt OPTEE-OS
> @@ -34,4 +44,8 @@ do_deploy() {
>   install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin 
> ${DEPLOYDIR}/ddr-rk3588.bin
>  }
>  
> +do_deploy() {
> +# Needed as a default perhaps a bb.fatal with a message saying an override 
> needs to be set
> +}
> +
>  addtask deploy after do_install
> diff --git a/recipes-bsp/u-boot/u-boot%.bbappend 
> b/recipes-bsp/u-boot/u-boot%.bbappend
> index e79c471..5af86aa 100644
> --- a/recipes-bsp/u-boot/u-boot%.bbappend
> +++ b/recipes-bsp/u-boot/u-boot%.bbappend
> @@ -1,25 +1,38 @@
> +do_compile:append:rock2-square () {
> + # copy to default search path
> + if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
> + cp ${B}/spl/${SPL_BINARY} ${B}
> + fi
> +}
> +
> +DEPENDS:append:rock-pi-4 = " gnutls-native"
>  # various machines require the pyelftools library for parsing dtb files
>  DEPENDS:append = " python3-pyelftools-native"
> -DEPENDS:append:rock-pi-4 = " gnutls-native"
>  
> -EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
> -EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
> -EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
> +INIT_FIRMWARE_DEPENDS ??= ""
> +
>

[yocto] [meta-rockchip] [PATCH] Add support for the Radxa Rock-3a based on rk3568

2023-10-05 Thread Anthony Davies

From: Anthony Davies 

Added appropriate inc files and machine.conf

Modified rockchip-rkbin_git.bb to allow machine overrides on
do_deploy.

I have tested this patch on my own rock-3a

Signed-off-by: Anthony Davies 
---
 README  |  1 +
 conf/machine/include/rk3568.inc | 17 ++
 conf/machine/rock-3a.conf   | 12 +++
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 16 -
 recipes-bsp/u-boot/u-boot%.bbappend | 43 -
 5 files changed, 73 insertions(+), 16 deletions(-)
 create mode 100644 conf/machine/include/rk3568.inc
 create mode 100644 conf/machine/rock-3a.conf

diff --git a/README b/README
index 8104474..aa1c834 100644
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ Status of supported boards:
vyasa-rk3288
firefly-rk3288
nanopi-r4s
+rock-3a
rock-5b
nanopi-r2s
builds:
diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc
new file mode 100644
index 000..5382b58
--- /dev/null
+++ b/conf/machine/include/rk3568.inc
@@ -0,0 +1,17 @@
+MACHINEOVERRIDES =. "rk3568:"
+DEFAULTTUNE ?= "cortexa55"
+
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/rockchip-wic.inc
+
+KBUILD_DEFCONFIG ?= "defconfig"
+KERNEL_FEATURES:append:rk3568 = " 
bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
+KERNEL_CLASSES ??= "kernel-fitimage"
+KERNEL_IMAGETYPE ??= "fitImage"
+
+PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
+PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
+
+UBOOT_SUFFIX ?= "itb"
+UBOOT_ENTRYPOINT ?= "0x0600"
diff --git a/conf/machine/rock-3a.conf b/conf/machine/rock-3a.conf
new file mode 100644
index 000..452bde0
--- /dev/null
+++ b/conf/machine/rock-3a.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Radxa Rock3a
+#@DESCRIPTION: ROCK3 is a series of Rockchip RK3566/RK3568 based SBC(Single 
Board Computer) and Compute Module by Radxa.
+#https://wiki.radxa.com/Rock3
+
+require conf/machine/include/rk3568.inc
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev"
+KERNEL_DEVICETREE = "rockchip/rk3568-rock-3a.dtb"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
+
+UBOOT_MACHINE = "rock-3a-rk3568_defconfig"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb 
b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index 7fefb01..273f394 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -14,6 +14,7 @@ S = "${WORKDIR}/git"
 
 COMPATIBLE_MACHINE = ""
 COMPATIBLE_MACHINE:rk3588s = "rk3588s"
+COMPATIBLE_MACHINE:rk3568 = "rk3568"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -25,7 +26,16 @@ do_install() {
 PACKAGES = "${PN}"
 ALLOW_EMPTY:${PN} = "1"
 
-do_deploy() {
+do_deploy:rk3568() {
+   # Prebuilt TF-A
+   install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf 
${DEPLOYDIR}/bl31-rk3568.elf
+   # Prebuilt OPTEE-OS
+   install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin 
${DEPLOYDIR}/tee-rk3568.bin
+   # Prebuilt U-Boot TPL (DDR init)
+   install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.18.bin 
${DEPLOYDIR}/ddr-rk3568.bin
+}
+
+do_deploy:rk3588s() {
# Prebuilt TF-A
install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf 
${DEPLOYDIR}/bl31-rk3588.elf
# Prebuilt OPTEE-OS
@@ -34,4 +44,8 @@ do_deploy() {
install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin 
${DEPLOYDIR}/ddr-rk3588.bin
 }
 
+do_deploy() {
+# Needed as a default perhaps a bb.fatal with a message saying an override 
needs to be set
+}
+
 addtask deploy after do_install
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend 
b/recipes-bsp/u-boot/u-boot%.bbappend
index e79c471..5af86aa 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -1,25 +1,38 @@
+do_compile:append:rock2-square () {
+   # copy to default search path
+   if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
+   cp ${B}/spl/${SPL_BINARY} ${B}
+   fi
+}
+
+DEPENDS:append:rock-pi-4 = " gnutls-native"
 # various machines require the pyelftools library for parsing dtb files
 DEPENDS:append = " python3-pyelftools-native"
-DEPENDS:append:rock-pi-4 = " gnutls-native"
 
-EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
-EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
-EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
+INIT_FIRMWARE_DEPENDS ??= ""
+
 EXTRA_OEMAKE:append:rk3588s = " \
BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
"
+INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
+INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy"
 
-INIT_FIRMWARE_DEPENDS ??= ""
-INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy"
-INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy"

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

2023-10-05 Thread Richard Purdie

On Thu, 2023-10-05 at 20:46 +0100, Richard Purdie via
lists.yoctoproject.org wrote:
> On Thu, 2023-10-05 at 17:42 +0100, Richard Purdie via
> lists.yoctoproject.org wrote:
> > On Mon, 2023-10-02 at 16:54 +0200, Fabien Thomas wrote:
> > > The purpose of this new builder is to report the reproducibility status
> > > of all meta-openembedded recipes layer by layer. It use the same
> > > reproducible selftest than OE-Core but setting only world as target,
> > > and excluding all oecore and other openembedded layer recipes.
> > > Also, the report output directory is split by layers.
> > > 
> > > Signed-off-by: Fabien Thomas 
> > > Reviewed-by: Yoann Congal 
> > > ---
> > > 
> > > Changes v1->v2 :
> > > * Split builder into multiple steps, one for each openembedded layers.
> > > * Split reports output in the same way, one for each layers.
> > > * For each step, only to be tested layer and its dependancies are added.
> > > * Every other layers than the one that is tested is excluded from world.
> > 
> > Thanks, I've merged this with a tweak of "reproducible-meta-
> > openembedded" -> "reproducible-meta-oe" just to keep things more
> > readable in the UI.
> > 
> > There is a test run queued here:
> > 
> > https://autobuilder.yoctoproject.org/typhoon/#/buildrequests/454516?redirect_to_build=true
> > 
> > but things are a bit busy atm on the autobuilder so it is queued.
> 
> That broke as did the second attempt. I've pushed controller side
> tweaks and some tweaks to helper which means this is now running:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/155/builds/3
> 
> Obviously there are still some failures but it is doing more this time
> and a least running something in some steps.

Whilst a lot of it failed, there was one piece that succeeded and
generated diffoscope output:

https://autobuilder.yoctoproject.org/typhoon/#/builders/155/builds/3/steps/21/logs/stdio
http://autobuilder.yocto.io/pub/repro-fail-openembedded-meta-initramfs/oe-reproducible-20231005-y6zo9rio/packages/diff-html/

As well as fixing the failures, the "short" names need work to make the
UI readable.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61251): https://lists.yoctoproject.org/g/yocto/message/61251
Mute This Topic: https://lists.yoctoproject.org/mt/101713575/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: 
https://lists.yoctoproject.org/g/yocto/leave/6691583/21656/737036229/xyzzy 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

2023-10-05 Thread Richard Purdie

On Thu, 2023-10-05 at 17:42 +0100, Richard Purdie via
lists.yoctoproject.org wrote:
> On Mon, 2023-10-02 at 16:54 +0200, Fabien Thomas wrote:
> > The purpose of this new builder is to report the reproducibility status
> > of all meta-openembedded recipes layer by layer. It use the same
> > reproducible selftest than OE-Core but setting only world as target,
> > and excluding all oecore and other openembedded layer recipes.
> > Also, the report output directory is split by layers.
> > 
> > Signed-off-by: Fabien Thomas 
> > Reviewed-by: Yoann Congal 
> > ---
> > 
> > Changes v1->v2 :
> > * Split builder into multiple steps, one for each openembedded layers.
> > * Split reports output in the same way, one for each layers.
> > * For each step, only to be tested layer and its dependancies are added.
> > * Every other layers than the one that is tested is excluded from world.
> 
> Thanks, I've merged this with a tweak of "reproducible-meta-
> openembedded" -> "reproducible-meta-oe" just to keep things more
> readable in the UI.
> 
> There is a test run queued here:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/buildrequests/454516?redirect_to_build=true
> 
> but things are a bit busy atm on the autobuilder so it is queued.

That broke as did the second attempt. I've pushed controller side
tweaks and some tweaks to helper which means this is now running:

https://autobuilder.yoctoproject.org/typhoon/#/builders/155/builds/3

Obviously there are still some failures but it is doing more this time
and a least running something in some steps.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61250): https://lists.yoctoproject.org/g/yocto/message/61250
Mute This Topic: https://lists.yoctoproject.org/mt/101713575/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: 
https://lists.yoctoproject.org/g/yocto/leave/6691583/21656/737036229/xyzzy 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [yocto][meta-lts-mixins][kirkstone/rust-1.68] gitignore: add pyc files

2023-10-05 Thread Scott Murray

Thanks, Peter, I have merged & pushed this to kirkstone/rust-1.68.
I had noticed it locally, but forgot to push something before some
travel last week.

Scott


On Sun, 24 Sep 2023, Peter Marko via lists.yoctoproject.org wrote:

> From: Peter Marko 
>
> Using this mixin layer causes dirty repository after parsing
> due to lib/mixin/rust.py compilation.
>
> Signed-off-by: Peter Marko 
> ---
>  .gitignore | 1 +
>  1 file changed, 1 insertion(+)
>  create mode 100644 .gitignore
>
> diff --git a/.gitignore b/.gitignore
> new file mode 100644
> index 000..0d20b64
> --- /dev/null
> +++ b/.gitignore
> @@ -0,0 +1 @@
> +*.pyc
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61249): https://lists.yoctoproject.org/g/yocto/message/61249
Mute This Topic: https://lists.yoctoproject.org/mt/101563477/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

2023-10-05 Thread Richard Purdie

On Mon, 2023-10-02 at 16:54 +0200, Fabien Thomas wrote:
> The purpose of this new builder is to report the reproducibility status
> of all meta-openembedded recipes layer by layer. It use the same
> reproducible selftest than OE-Core but setting only world as target,
> and excluding all oecore and other openembedded layer recipes.
> Also, the report output directory is split by layers.
> 
> Signed-off-by: Fabien Thomas 
> Reviewed-by: Yoann Congal 
> ---
> 
> Changes v1->v2 :
> * Split builder into multiple steps, one for each openembedded layers.
> * Split reports output in the same way, one for each layers.
> * For each step, only to be tested layer and its dependancies are added.
> * Every other layers than the one that is tested is excluded from world.

Thanks, I've merged this with a tweak of "reproducible-meta-
openembedded" -> "reproducible-meta-oe" just to keep things more
readable in the UI.

There is a test run queued here:

https://autobuilder.yoctoproject.org/typhoon/#/buildrequests/454516?redirect_to_build=true

but things are a bit busy atm on the autobuilder so it is queued.

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61248): https://lists.yoctoproject.org/g/yocto/message/61248
Mute This Topic: https://lists.yoctoproject.org/mt/101713575/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: 
https://lists.yoctoproject.org/g/yocto/leave/6691583/21656/737036229/xyzzy 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [yocto] [meta-rockchip][kirkstone][PATCH] rk3588(s): add

2023-10-05 Thread Quentin Schulz via lists.yoctoproject.org


Hi Trevor,

On 10/5/23 11:00, Quentin Schulz wrote:

From: Trevor Woerner 

Unfortunately the TF-A project does not currently have support for
the rk3588. Therefore, for the time-being, the only way to supply a
TPL/DDR-init for the rk3588 is to use the closed-source rkbin binaries
from Rockchip. If/when TF-A adds support for the rk3588 we can investigate
switching.

The rk3588 comes in two variants: rk3588 and rk3588s. The "s" option is a
stripped-down version of the rk3588. In the Linux kernel these two SoCs are
kept separate, with the rk3588 building on the rk3588s, so we've mimicked that
same behaviour here.

Signed-off-by: Quentin Schulz 
Signed-off-by: Trevor Woerner 
[backported from f8af59dd7cd7 ("rock-5b: add")]
[removed support for rock-5b since no decent linux-yocto support in kirkstone]
[removed KERNEL_FEATURES and kmeta since no decent linux-yocto support in 
kirkstone]
[renamed INIT_FIRMWARE_DEPENDS to ATF_DEPENDS]


^^^ This is actually something we probably need to discuss?

This makes it harder to backport patches from the master branch to 
kirkstone because we have to be careful to rename those variables before 
applying the patch (even if somehow it applies cleanly).


On the other hand, migrating to the new name means we break the current 
behavior for downstream users of meta-rockchip.


Cheers,
Quentin


[tested on downstream board with downstream kernel and u-boot]
Signed-off-by: Quentin Schulz 
---
  conf/machine/include/rk3588.inc |  6 
  conf/machine/include/rk3588s.inc| 16 +++
  recipes-bsp/rkbin/rockchip-rkbin_git.bb | 37 +
  recipes-bsp/u-boot/u-boot%.bbappend |  6 
  4 files changed, 65 insertions(+)
  create mode 100644 conf/machine/include/rk3588.inc
  create mode 100644 conf/machine/include/rk3588s.inc
  create mode 100644 recipes-bsp/rkbin/rockchip-rkbin_git.bb

diff --git a/conf/machine/include/rk3588.inc b/conf/machine/include/rk3588.inc
new file mode 100644
index 000..34f0627
--- /dev/null
+++ b/conf/machine/include/rk3588.inc
@@ -0,0 +1,6 @@
+MACHINEOVERRIDES =. "rk3588:"
+
+# the rk3588s is a "stripped-down" version of the rk3588
+# in the kernel's device-tree the rk3588 builds on top of the rk3588s
+# so anything that is valid for the rk3588s is valid for the rk3588
+require conf/machine/include/rk3588s.inc
diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc
new file mode 100644
index 000..3da226e
--- /dev/null
+++ b/conf/machine/include/rk3588s.inc
@@ -0,0 +1,16 @@
+MACHINEOVERRIDES =. "rk3588s:"
+DEFAULTTUNE ?= "cortexa76-cortexa55-crypto"
+
+require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
+require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/rockchip-wic.inc
+
+KBUILD_DEFCONFIG ?= "defconfig"
+KERNEL_CLASSES = "kernel-fitimage"
+KERNEL_IMAGETYPE = "fitImage"
+
+PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
+PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
+
+UBOOT_SUFFIX ?= "itb"
+UBOOT_ENTRYPOINT ?= "0x0600"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb 
b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
new file mode 100644
index 000..7fefb01
--- /dev/null
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Rockchip Firmware and Tool Binaries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
+
+SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master"
+SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23"
+
+PROVIDES += "trusted-firmware-a"
+PROVIDES += "optee-os"
+
+inherit bin_package deploy
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = ""
+COMPATIBLE_MACHINE:rk3588s = "rk3588s"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+   # Nothing in this recipe is useful in a filesystem
+   :
+}
+
+PACKAGES = "${PN}"
+ALLOW_EMPTY:${PN} = "1"
+
+do_deploy() {
+   # Prebuilt TF-A
+   install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf 
${DEPLOYDIR}/bl31-rk3588.elf
+   # Prebuilt OPTEE-OS
+   install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin 
${DEPLOYDIR}/tee-rk3588.bin
+   # Prebuilt U-Boot TPL (DDR init)
+   install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin 
${DEPLOYDIR}/ddr-rk3588.bin
+}
+
+addtask deploy after do_install
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend 
b/recipes-bsp/u-boot/u-boot%.bbappend
index de1f2ca..c611377 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -7,6 +7,12 @@ do_compile:append:rock2-square () {
  
  ATF_DEPENDS ??= ""
  
+EXTRA_OEMAKE:append:rk3588s = " \

+   BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
+   ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
+   "
+ATF_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
+
  EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
  ATF_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
  EXTRA_OEMAKE:append:rk3328

[yocto] [meta-rockchip][kirkstone][PATCH] rk3588(s): add

2023-10-05 Thread Quentin Schulz

From: Trevor Woerner 

Unfortunately the TF-A project does not currently have support for
the rk3588. Therefore, for the time-being, the only way to supply a
TPL/DDR-init for the rk3588 is to use the closed-source rkbin binaries
from Rockchip. If/when TF-A adds support for the rk3588 we can investigate
switching.

The rk3588 comes in two variants: rk3588 and rk3588s. The "s" option is a
stripped-down version of the rk3588. In the Linux kernel these two SoCs are
kept separate, with the rk3588 building on the rk3588s, so we've mimicked that
same behaviour here.

Signed-off-by: Quentin Schulz 
Signed-off-by: Trevor Woerner 
[backported from f8af59dd7cd7 ("rock-5b: add")]
[removed support for rock-5b since no decent linux-yocto support in kirkstone]
[removed KERNEL_FEATURES and kmeta since no decent linux-yocto support in 
kirkstone]
[renamed INIT_FIRMWARE_DEPENDS to ATF_DEPENDS]
[tested on downstream board with downstream kernel and u-boot]
Signed-off-by: Quentin Schulz 
---
 conf/machine/include/rk3588.inc |  6 
 conf/machine/include/rk3588s.inc| 16 +++
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 37 +
 recipes-bsp/u-boot/u-boot%.bbappend |  6 
 4 files changed, 65 insertions(+)
 create mode 100644 conf/machine/include/rk3588.inc
 create mode 100644 conf/machine/include/rk3588s.inc
 create mode 100644 recipes-bsp/rkbin/rockchip-rkbin_git.bb

diff --git a/conf/machine/include/rk3588.inc b/conf/machine/include/rk3588.inc
new file mode 100644
index 000..34f0627
--- /dev/null
+++ b/conf/machine/include/rk3588.inc
@@ -0,0 +1,6 @@
+MACHINEOVERRIDES =. "rk3588:"
+
+# the rk3588s is a "stripped-down" version of the rk3588
+# in the kernel's device-tree the rk3588 builds on top of the rk3588s
+# so anything that is valid for the rk3588s is valid for the rk3588
+require conf/machine/include/rk3588s.inc
diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc
new file mode 100644
index 000..3da226e
--- /dev/null
+++ b/conf/machine/include/rk3588s.inc
@@ -0,0 +1,16 @@
+MACHINEOVERRIDES =. "rk3588s:"
+DEFAULTTUNE ?= "cortexa76-cortexa55-crypto"
+
+require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc
+require conf/machine/include/rockchip-defaults.inc
+require conf/machine/include/rockchip-wic.inc
+
+KBUILD_DEFCONFIG ?= "defconfig"
+KERNEL_CLASSES = "kernel-fitimage"
+KERNEL_IMAGETYPE = "fitImage"
+
+PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
+PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
+
+UBOOT_SUFFIX ?= "itb"
+UBOOT_ENTRYPOINT ?= "0x0600"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb 
b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
new file mode 100644
index 000..7fefb01
--- /dev/null
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Rockchip Firmware and Tool Binaries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
+
+SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master"
+SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23"
+
+PROVIDES += "trusted-firmware-a"
+PROVIDES += "optee-os"
+
+inherit bin_package deploy
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = ""
+COMPATIBLE_MACHINE:rk3588s = "rk3588s"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+   # Nothing in this recipe is useful in a filesystem
+   :
+}
+
+PACKAGES = "${PN}"
+ALLOW_EMPTY:${PN} = "1"
+
+do_deploy() {
+   # Prebuilt TF-A
+   install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf 
${DEPLOYDIR}/bl31-rk3588.elf
+   # Prebuilt OPTEE-OS
+   install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin 
${DEPLOYDIR}/tee-rk3588.bin
+   # Prebuilt U-Boot TPL (DDR init)
+   install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin 
${DEPLOYDIR}/ddr-rk3588.bin
+}
+
+addtask deploy after do_install
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend 
b/recipes-bsp/u-boot/u-boot%.bbappend
index de1f2ca..c611377 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -7,6 +7,12 @@ do_compile:append:rock2-square () {
 
 ATF_DEPENDS ??= ""
 
+EXTRA_OEMAKE:append:rk3588s = " \
+   BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
+   ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
+   "
+ATF_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
+
 EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
 ATF_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy"
 EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
-- 
2.41.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61246): https://lists.yoctoproject.org/g/yocto/message/61246
Mute This Topic: https://lists.yoctoproject.org/mt/101773111/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[yocto] [layerindex-web 3/3] requirements: bump django-simple-captcha to 0.5.20

[yocto] [layerindex-web 2/3] dockersetup.py: databasefile zstd compression

[yocto] [layerindex-web 1/3] build(deps): bump pillow from 9.3.0 to 10.0.1

[yocto-announce] [ANNOUNCEMENT] Yocto Project 4.0.13 is Released

[yocto] [ANNOUNCEMENT] Yocto Project 4.0.13 is Released

Re: [yocto] [meta-rockchip] [PATCH] Add support for the Radxa Rock-3a based on rk3568

[yocto] [meta-rockchip] [PATCH] Add support for the Radxa Rock-3a based on rk3568

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

Re: [yocto][meta-lts-mixins][kirkstone/rust-1.68] gitignore: add pyc files

Re: [yocto] [yocto-autobuilder-helper][PATCH v2] config.json: add reproducible-openembedded build

Re: [yocto] [meta-rockchip][kirkstone][PATCH] rk3588(s): add

[yocto] [meta-rockchip][kirkstone][PATCH] rk3588(s): add

13 matches

Site Navigation

Mail list logo

Footer information