From 08accd8fcfeb74e8cc94a76ad1653e046d7b3255 Mon Sep 17 00:00:00 2001 From: lindongping Date: Wed, 28 May 2025 10:53:22 +0800 Subject: [PATCH 1/5] README: openamp support linux 5.10 Signed-off-by: lindongping --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eaa3d10d..3621b753 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Buildroot被设计为在x86 Linux系统上运行，结合其他因素，本仓 – git ``` 除此之外，还需要安装如下软件包： -`$ sudo apt install debootstrap qemu-user-static binfmt-support debian-archive-keyring` +`$ sudo apt install debootstrap qemu-user-static binfmt-support debian-archive-keyring eatmydata` 对于debian11系统，需要设置PATH环境变量：`PATH=$PATH:/usr/sbin` ## 下载Phytium Pi OS @@ -168,7 +168,7 @@ pyjailhouse安装到/usr/lib/python3.10/site-packages， ### 支持openamp 本项目还支持编译openamp，编译OpenAMP裸跑二进制镜像请参考：`https://gitee.com/phytium_embedded/phytium-standalone-sdk`，编译OpenAMP FreeRTOS二进制镜像请参考：`https://gitee.com/phytium_embedded/phytium-free-rtos-sdk` -支持将openamp二进制镜像、用户空间测试程序安装到飞腾派OS系统上，openamp支持linux 4.19，linux 5.10内核，并且5.10内核下功能更丰富，推荐使用5.10内核。如果需要编译openamp请执行： +支持将openamp二进制镜像、用户空间测试程序安装到飞腾派OS系统上，openamp支持linux 5.10内核。如果需要编译openamp请执行： （1）使用phytiumpi_xxx_defconfig作为基础配置项，合并支持openamp的配置： `./support/kconfig/merge_config.sh configs/phytiumpi_xxx_defconfig configs/openamp_xxx.config` 其中，`phytiumpi_xxx_defconfig`为`phytiumpi_defconfig`或`phytiumpi_desktop_defconfig`； -- Gitee From bcf4cd03768fe34b1ef9365060802ac7a9bc2f71 Mon Sep 17 00:00:00 2001 From: lindongping Date: Wed, 28 May 2025 19:10:48 +0800 Subject: [PATCH 2/5] linux: update to v2.3 Signed-off-by: lindongping --- configs/phytiumpi_defconfig | 2 +- configs/phytiumpi_desktop_defconfig | 2 +- configs/phytiumpi_linux_4.19.config | 2 +- configs/phytiumpi_linux_4.19_rt.config | 2 +- configs/phytiumpi_linux_5.10_rt.config | 2 +- configs/phytiumpi_xenomai_mercury_4.19.config | 2 +- configs/phytiumpi_xenomai_mercury_5.10.config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 6355de94..3a7f4aac 100644 --- a/configs/phytiumpi_defconfig +++ b/configs/phytiumpi_defconfig @@ -36,7 +36,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 5.10 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e6a4da02bb8d91f5074b18168a24798443b43fea" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.3" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_desktop_defconfig b/configs/phytiumpi_desktop_defconfig index e00a6353..9f10296a 100644 --- a/configs/phytiumpi_desktop_defconfig +++ b/configs/phytiumpi_desktop_defconfig @@ -36,7 +36,7 @@ BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-linux-kernel.git" # kernel 5.10 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e6a4da02bb8d91f5074b18168a24798443b43fea" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.3" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/configs/phytiumpi_linux_4.19.config b/configs/phytiumpi_linux_4.19.config index 37ca08eb..49b132ff 100644 --- a/configs/phytiumpi_linux_4.19.config +++ b/configs/phytiumpi_linux_4.19.config @@ -1,3 +1,3 @@ # kernel 4.19 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="64eb3d620941f6ec0f6af2a24fd42819fa2dc366" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19_v2.3" BR2_PACKAGE_RTL8821CS=y diff --git a/configs/phytiumpi_linux_4.19_rt.config b/configs/phytiumpi_linux_4.19_rt.config index 8c4f086c..971a3c38 100644 --- a/configs/phytiumpi_linux_4.19_rt.config +++ b/configs/phytiumpi_linux_4.19_rt.config @@ -1,2 +1,2 @@ # kernel 4.19-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e0fcdeaba3fc9866393ed6c2102b9a5f9415d6b2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19-rt_v2.3" diff --git a/configs/phytiumpi_linux_5.10_rt.config b/configs/phytiumpi_linux_5.10_rt.config index 60a12668..65d6d558 100644 --- a/configs/phytiumpi_linux_5.10_rt.config +++ b/configs/phytiumpi_linux_5.10_rt.config @@ -1,2 +1,2 @@ # kernel 5.10-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fa09984405016a2678f5507fd5e10b3119ec7559" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10-rt_v2.3" diff --git a/configs/phytiumpi_xenomai_mercury_4.19.config b/configs/phytiumpi_xenomai_mercury_4.19.config index 643f8435..e2eef534 100644 --- a/configs/phytiumpi_xenomai_mercury_4.19.config +++ b/configs/phytiumpi_xenomai_mercury_4.19.config @@ -1,5 +1,5 @@ # kernel 4.19-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e0fcdeaba3fc9866393ed6c2102b9a5f9415d6b2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19-rt_v2.3" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y diff --git a/configs/phytiumpi_xenomai_mercury_5.10.config b/configs/phytiumpi_xenomai_mercury_5.10.config index db950790..1d506d1e 100644 --- a/configs/phytiumpi_xenomai_mercury_5.10.config +++ b/configs/phytiumpi_xenomai_mercury_5.10.config @@ -1,5 +1,5 @@ # kernel 5.10-rt -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fa09984405016a2678f5507fd5e10b3119ec7559" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10-rt_v2.3" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y -- Gitee From 3b73ff3000ff6e760dab25bf015ca80505a29155 Mon Sep 17 00:00:00 2001 From: lindongping Date: Wed, 28 May 2025 19:14:38 +0800 Subject: [PATCH 3/5] optee: update to 4.6.0 Signed-off-by: lindongping --- configs/phytiumpi_optee.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/phytiumpi_optee.config b/configs/phytiumpi_optee.config index 5edcfcbc..7ed81c78 100644 --- a/configs/phytiumpi_optee.config +++ b/configs/phytiumpi_optee.config @@ -3,5 +3,5 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/phytium_ BR2_PACKAGE_PHYTIUM_OPTEE=y BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/phytium-optee.git" -BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_VERSION="v4.5.2" +BR2_PACKAGE_PHYTIUM_OPTEE_CUSTOM_REPO_VERSION="v4.6.0" BR2_PACKAGE_PHYTIUM_OPTEE_BOARD="phytiumpi" -- Gitee From 36efee8f85f4d8db95531f01ab445fb63798c791 Mon Sep 17 00:00:00 2001 From: lindongping Date: Wed, 28 May 2025 19:15:59 +0800 Subject: [PATCH 4/5] update xenomai, ethercat, jailhouse to v2.3 Signed-off-by: lindongping --- configs/phytiumpi_xenomai_cobalt_4.19.config | 2 +- configs/phytiumpi_xenomai_cobalt_5.10.config | 2 +- package/igh-ethercat/igh-ethercat.mk | 2 +- package/jailhouse/jailhouse.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/phytiumpi_xenomai_cobalt_4.19.config b/configs/phytiumpi_xenomai_cobalt_4.19.config index 84f002dd..94e82e3f 100644 --- a/configs/phytiumpi_xenomai_cobalt_4.19.config +++ b/configs/phytiumpi_xenomai_cobalt_4.19.config @@ -1,6 +1,6 @@ # cobalt kernel 4.19.209-cip59 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/linux-kernel-xenomai.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="9047e03ad6f681a2a9b22603e29f959732722748" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19.209-cip59_v2.3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/cobalt.config" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y diff --git a/configs/phytiumpi_xenomai_cobalt_5.10.config b/configs/phytiumpi_xenomai_cobalt_5.10.config index 9b65563d..c6f090ad 100644 --- a/configs/phytiumpi_xenomai_cobalt_5.10.config +++ b/configs/phytiumpi_xenomai_cobalt_5.10.config @@ -1,6 +1,6 @@ # cobalt kernel 5.10.209-dovetail1 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/linux-kernel-xenomai.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="28783e5cc2dfdeac4ae77538955de94df73873cd" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10.209-dovetail1_v2.3" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm64/configs/cobalt.config" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 8ea2cb9d..42e2c337 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 47dc5942ff6b982197e70342279e7788e8cf1425 +IGH_ETHERCAT_VERSION = stable-1.6_v4.0 IGH_ETHERCAT_SITE = https://gitee.com/phytium_embedded/ether-cat.git IGH_ETHERCAT_SITE_METHOD = git IGH_ETHERCAT_AUTORECONF = YES diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index 8dfa2177..65bd0164 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -JAILHOUSE_VERSION = 1581a8ceaaa1f0a4ec6ea95b6dca3ba5f4e62ba5 +JAILHOUSE_VERSION = 086b03865bea241c49efd53f5a77891637a2128e JAILHOUSE_SITE = https://gitee.com/phytium_embedded/phytium-jailhouse.git JAILHOUSE_SITE_METHOD = git JAILHOUSE_LICENSE = GPL-2.0 -- Gitee From 66e952b78e4b92bc2b1b2e4a60198def991a828f Mon Sep 17 00:00:00 2001 From: lindongping Date: Wed, 28 May 2025 19:16:26 +0800 Subject: [PATCH 5/5] post-custom-skeleton-debian-11.sh: update lsb_release to v1.7 Signed-off-by: lindongping --- board/phytium/common/post-custom-skeleton-debian-11.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/phytium/common/post-custom-skeleton-debian-11.sh b/board/phytium/common/post-custom-skeleton-debian-11.sh index 1a85eba2..192b3b5d 100755 --- a/board/phytium/common/post-custom-skeleton-debian-11.sh +++ b/board/phytium/common/post-custom-skeleton-debian-11.sh @@ -135,7 +135,7 @@ setup_distribution_info () { echo DISTRIB_ID=Phytium > $tgtfile echo DISTRIB_RELEASE=1.0 >> $tgtfile echo DISTRIB_CODENAME=1.0 >> $tgtfile - echo 'DISTRIB_DESCRIPTION="Phytium Pi OS V1.6"' >> $tgtfile + echo 'DISTRIB_DESCRIPTION="Phytium Pi OS V1.7"' >> $tgtfile tgtfile=$RFSDIR/etc/update-motd.d/00-header echo '#!/bin/sh' > $tgtfile -- Gitee