From 3d855938f4ac2577fb01a626de1da481331487b4 Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 11:39:58 +0800 Subject: [PATCH 1/3] update kernel version to v2.1 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index bf330c5d..07fa72c8 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="3d4c08f6ed3e1dd0732b2f9701439a0cb34190e5" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.1" 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 1c1c7753..95c55a28 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="3d4c08f6ed3e1dd0732b2f9701439a0cb34190e5" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10_v2.1" 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 99e37ac4..745dda7a 100644 --- a/configs/phytiumpi_linux_4.19.config +++ b/configs/phytiumpi_linux_4.19.config @@ -1,2 +1,2 @@ # kernel 4.19 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19_v2.1" diff --git a/configs/phytiumpi_linux_4.19_rt.config b/configs/phytiumpi_linux_4.19_rt.config index 04211358..b5161f3b 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="kernel-4.19-rt_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19-rt_v2.1" diff --git a/configs/phytiumpi_linux_5.10_rt.config b/configs/phytiumpi_linux_5.10_rt.config index c51e02dd..fc56ed56 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="c5d2908c782302764ce3be2f692e3cdb1f590818" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10-rt_v2.1" -- Gitee From 5e060015001a5fdf0a39c394fb2e48d7d5901202 Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 11:41:07 +0800 Subject: [PATCH 2/3] update xenomai version to v2.1 Signed-off-by: lindongping --- configs/phytiumpi_xenomai_cobalt_4.19.config | 2 +- configs/phytiumpi_xenomai_cobalt_5.10.config | 2 +- configs/phytiumpi_xenomai_mercury_4.19.config | 2 +- configs/phytiumpi_xenomai_mercury_5.10.config | 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 b59af630..a4c55e99 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="kernel-4.19.209-cip59_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19.209-cip59_v2.1" 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 e6def9f4..7fe84833 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.153-dovetail3 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitee.com/phytium_embedded/linux-kernel-xenomai.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7e620fb8c67974f74836c8ca0553e78c04b97d96" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10.153-dovetail3_v2.1" 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 a5090d04..ffe42513 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="kernel-4.19-rt_v2.0" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-4.19-rt_v2.1" # 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 e0861a69..62f6e900 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="c5d2908c782302764ce3be2f692e3cdb1f590818" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="kernel-5.10-rt_v2.1" # xenomai libraries and tools BR2_PACKAGE_XENOMAI=y BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y -- Gitee From ed4c5da1b9db5b010a1c7ced865e4010dfad486e Mon Sep 17 00:00:00 2001 From: lindongping Date: Tue, 30 Apr 2024 11:41:52 +0800 Subject: [PATCH 3/3] update ethercat version to v2.1 Signed-off-by: lindongping --- package/igh-ethercat/igh-ethercat.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk index ac784e70..83e0cc5b 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = stable-1.5-rt_v1.1 +IGH_ETHERCAT_VERSION = stable-1.5-rt_v2.1 IGH_ETHERCAT_SITE = https://gitee.com/phytium_embedded/ether-cat.git IGH_ETHERCAT_SITE_METHOD = git IGH_ETHERCAT_AUTORECONF = YES -- Gitee