diff --git a/README.md b/README.md index eaa3d10d0eee0d770b748b3da0fa75f8d88c21f1..3621b75316aba7ef84f8bdff466142be46035219 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`; diff --git a/board/phytium/common/post-custom-skeleton-debian-11.sh b/board/phytium/common/post-custom-skeleton-debian-11.sh index 1a85eba22672ae90ffad5164623b5d791dbdb068..192b3b5d8f08041d1e26aa8f4bb3a93b7d4f1235 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 diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 6355de94d7177801216424707dfe443ba0dfedf6..3a7f4aac26ed78d46098569e4aad7aab2c889c9d 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 e00a6353fdebb573fad3779bbc022af56db49f2b..9f10296a437cda3ed634fcab5cf6b9dbd8288363 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 37ca08eb6eb3a28e43e63098e130f84d69b47302..49b132ffa511b169c062cf7a25f8456864de6683 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 8c4f086c03d8d802f750b058aaf45fac392591b2..971a3c38b870dfc4965223e880dd93755e5e353c 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 60a1266820afec3dffb5379266df5e24e95444b7..65d6d5581ab4d4e70b7ef88166d838a85a7ea7df 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_optee.config b/configs/phytiumpi_optee.config index 5edcfcbc2df9c8b1d956b03d259ae1a36bb9f1b6..7ed81c7822e6992f5eb36a9f63d05b4b8e111ac4 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" diff --git a/configs/phytiumpi_xenomai_cobalt_4.19.config b/configs/phytiumpi_xenomai_cobalt_4.19.config index 84f002dd4829a1c1133f0d3aa0123e0ceeb684f5..94e82e3f3fd72b4093c8a37920e3979e64d910b4 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 9b65563d4d6dfe381aaa073560952a2c3c3b58df..c6f090adcdc62f58abca8459816bbe41ec5f8d44 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/configs/phytiumpi_xenomai_mercury_4.19.config b/configs/phytiumpi_xenomai_mercury_4.19.config index 643f8435fe0bee1cba013b4cc9a1af096bf85200..e2eef534be37fb18df2c8a5fa911d8c9f2d95b5f 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 db95079012eb15f7066200d7bc98a200cd4a7ab0..1d506d1e6ea237e42d21156769189d738126660e 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 diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index 8ea2cb9dad9a2e81086fefd6bb5e3266c8aca138..42e2c337ec474ed6fdcfa62279490797bc7b1765 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 8dfa21778ca710c0d84ffc5728b56f74501adda9..65bd0164911b52da889ad2f07973899713b502c2 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