diff --git a/configs/openamp_free_rtos.config b/configs/openamp_free_rtos.config index 36ac39a8a3057faa6012e015ad5a5f3f34a1c687..faed135d3e457ad99336fb85121549330ae9d2bc 100644 --- a/configs/openamp_free_rtos.config +++ b/configs/openamp_free_rtos.config @@ -7,4 +7,5 @@ BR2_PACKAGE_RPMSG_DEMO=y # free-rtos openamp BR2_PACKAGE_PHYTIUM_FREE_RTOS=y BR2_PACKAGE_PHYTIUM_FREE_RTOS_CPU_NAME="phytiumpi" - +BR2_PACKAGE_HOST_PYTHON3=y +BR2_PACKAGE_HOST_PYTHON3_CURSES=y diff --git a/configs/openamp_standalone.config b/configs/openamp_standalone.config index a57cfe737efbc8a14b6b58b824a9732cda9ee72c..dc672e917f2be45d6a47647365fab25509350d3e 100644 --- a/configs/openamp_standalone.config +++ b/configs/openamp_standalone.config @@ -7,4 +7,5 @@ BR2_PACKAGE_RPMSG_DEMO=y # standalone openamp BR2_PACKAGE_PHYTIUM_STANDALONE=y BR2_PACKAGE_PHYTIUM_STANDALONE_CPU_NAME="phytiumpi" - +BR2_PACKAGE_HOST_PYTHON3=y +BR2_PACKAGE_HOST_PYTHON3_CURSES=y diff --git a/configs/phytiumpi_defconfig b/configs/phytiumpi_defconfig index 63e7caca41507ac2acb8c14b1b57da622abf9f0e..dbb19a750e7c34fbf665004eef5a0fdb39660ddf 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="kernel-5.10_v2.2" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2f5aba740e588982f5f910998372b7ebce0a66ad" 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 59766bc5e98fc999c030b02d23f442c33cd10d5c..c5d567c1bafc7c307792689083067a7d789c745c 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="7b787a8c53e522e122d35912c830849321aa9ae4" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="2f5aba740e588982f5f910998372b7ebce0a66ad" BR2_LINUX_KERNEL_INTREE_DTS_NAME="phytium/phytiumpi_firefly" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_DEFCONFIG="phytium" diff --git a/linux/kernel-patches/openamp/0001-modify-the-dts-of-phytiumpi-to-enable-homo_rproc.patch b/linux/kernel-patches/openamp/0001-modify-the-dts-of-phytiumpi-to-enable-homo_rproc.patch index 8a04af88016dfa7e7ecbeac96897e5543100c64d..98afa528dfdfe92492cd2635e84305aea256542f 100644 --- a/linux/kernel-patches/openamp/0001-modify-the-dts-of-phytiumpi-to-enable-homo_rproc.patch +++ b/linux/kernel-patches/openamp/0001-modify-the-dts-of-phytiumpi-to-enable-homo_rproc.patch @@ -1,18 +1,19 @@ -From f1d8c50668be3bff4bc2038477d75e67e4b0846d Mon Sep 17 00:00:00 2001 -From: lindongping -Date: Thu, 7 Mar 2024 15:06:48 +0800 +From d873d9fd316be40e71d7765b02b7e073d4db26e8 Mon Sep 17 00:00:00 2001 +From: lindongping2027 +Date: Mon, 21 Apr 2025 10:48:14 +0800 Subject: [PATCH] modify the dts of phytiumpi to enable homo_rproc +Signed-off-by: lindongping2027 --- - arch/arm64/boot/dts/phytium/pe2204.dtsi | 21 +++++++++++++++++++ + arch/arm64/boot/dts/phytium/pe2204.dtsi | 23 +++++++++++++++++++ .../boot/dts/phytium/phytiumpi_firefly.dts | 4 ++++ - 2 files changed, 25 insertions(+) + 2 files changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/phytium/pe2204.dtsi b/arch/arm64/boot/dts/phytium/pe2204.dtsi -index 4d5d7b295..eeb3873de 100644 +index 4d5d7b2951..34da69ca99 100644 --- a/arch/arm64/boot/dts/phytium/pe2204.dtsi +++ b/arch/arm64/boot/dts/phytium/pe2204.dtsi -@@ -16,6 +16,27 @@ aliases { +@@ -16,6 +16,29 @@ aliases { ethernet2 = &macb2; ethernet3 = &macb3; }; @@ -21,9 +22,7 @@ index 4d5d7b295..eeb3873de 100644 + #address-cells = <0x2>; + #size-cells = <0x2>; + ranges; -+ -+ rproc: rproc@b0100000 { -+ /*下面的保留物理地址可以根据机器实际指定地址范围 */ ++ rproc0: rproc0@b0100000 { + no-map; + reg = <0x0 0xb0100000 0x0 0x19900000>; + }; @@ -31,30 +30,34 @@ index 4d5d7b295..eeb3873de 100644 + + homo_rproc: homo_rproc@0 { + compatible = "homo,rproc"; -+ remote-processor = <3>; -+ inter-processor-interrupt = <9>; -+ memory-region = <&rproc>; -+ firmware-name = "openamp_core0.elf"; + status = "disabled"; ++ homo_core0: homo_core0@b0100000 { ++ compatible = "homo,rproc-core"; ++ remote-processor = <3>; ++ inter-processor-interrupt = <9>; ++ memory-region = <&rproc0>; ++ firmware-name = "openamp_core0.elf"; ++ }; + }; ++ }; &cpu { diff --git a/arch/arm64/boot/dts/phytium/phytiumpi_firefly.dts b/arch/arm64/boot/dts/phytium/phytiumpi_firefly.dts -index 82ff32a36..a6f6e3dc7 100644 +index 13f2e61bf6..06d44da055 100644 --- a/arch/arm64/boot/dts/phytium/phytiumpi_firefly.dts +++ b/arch/arm64/boot/dts/phytium/phytiumpi_firefly.dts -@@ -311,6 +311,10 @@ &pmdk_dp { +@@ -314,6 +314,10 @@ &pmdk_dp { status = "okay"; }; +&homo_rproc { -+ status = "okay"; ++ status = "okay"; +}; + &rng0 { status = "okay"; }; -- -2.34.1 +2.43.0 diff --git a/package/phytium-free-rtos/phytium-free-rtos.mk b/package/phytium-free-rtos/phytium-free-rtos.mk index cf6ab261a91a801b9166ddd4cbfb87b1ebab8d45..217e67ff78c0130914ff17a8241ecbebd2ae5a12 100644 --- a/package/phytium-free-rtos/phytium-free-rtos.mk +++ b/package/phytium-free-rtos/phytium-free-rtos.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHYTIUM_FREE_RTOS_VERSION = 696ae90ea57126797a5fb2c0d111959f9bf4455c +PHYTIUM_FREE_RTOS_VERSION = openamp-v1.0 PHYTIUM_FREE_RTOS_SITE = https://gitee.com/phytium_embedded/phytium-free-rtos-sdk.git PHYTIUM_FREE_RTOS_SITE_METHOD = git PHYTIUM_FREE_RTOS_DEPENDENCIES = host-phytium-iot-environment host-python3 linux @@ -23,7 +23,7 @@ define PHYTIUM_FREE_RTOS_BUILD_CMDS fi && \ . $(HOST_DIR)/etc/profile.d/phytium_dev.sh && \ cd $(@D)/example/system/amp/openamp_for_linux && \ - $(TARGET_MAKE_ENV) $(MAKE1) config_$(PHYTIUM_FREE_RTOS_CPU)_$${PHYTIUM_FREE_RTOS_ARCH} && \ + script -q -c "$(TARGET_MAKE_ENV) $(MAKE1) config_$(PHYTIUM_FREE_RTOS_CPU)_$${PHYTIUM_FREE_RTOS_ARCH}" /dev/null && \ mkdir -p $(TARGET_DIR)/lib/firmware && \ $(TARGET_MAKE_ENV) $(MAKE1) image USR_BOOT_DIR=$(TARGET_DIR)/lib/firmware endef diff --git a/package/phytium-standalone/phytium-standalone.mk b/package/phytium-standalone/phytium-standalone.mk index c3afc524a69bc79059c024e94197f30cb4cb5741..c8af6c512f0016b2f4cc98578505498fc435185a 100644 --- a/package/phytium-standalone/phytium-standalone.mk +++ b/package/phytium-standalone/phytium-standalone.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHYTIUM_STANDALONE_VERSION = v1.2.3 +PHYTIUM_STANDALONE_VERSION = openamp-v1.0 PHYTIUM_STANDALONE_SITE = https://gitee.com/phytium_embedded/phytium-standalone-sdk.git PHYTIUM_STANDALONE_SITE_METHOD = git PHYTIUM_STANDALONE_DEPENDENCIES = host-phytium-iot-environment host-python3 linux @@ -18,7 +18,7 @@ define PHYTIUM_STANDALONE_BUILD_CMDS fi && \ . $(HOST_DIR)/etc/profile.d/phytium_dev.sh && \ cd $(@D)/example/system/amp/openamp_for_linux && \ - $(TARGET_MAKE_ENV) $(MAKE1) config_$(PHYTIUM_STANDALONE_CPU)_$${PHYTIUM_STANDALONE_ARCH} && \ + script -q -c "$(TARGET_MAKE_ENV) $(MAKE1) config_$(PHYTIUM_STANDALONE_CPU)_$${PHYTIUM_STANDALONE_ARCH}" /dev/null && \ mkdir -p $(TARGET_DIR)/lib/firmware && \ $(TARGET_MAKE_ENV) $(MAKE1) image USR_BOOT_DIR=$(TARGET_DIR)/lib/firmware endef diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 77d608bdc04ca69a9512696b134ac7842f23a6c4..88c286c55b2b738f781b60baeafee90253a1fc4f 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -12,6 +12,11 @@ config BR2_PACKAGE_HOST_PYTHON3_BZIP2 help bz2 module for host Python3. +config BR2_PACKAGE_HOST_PYTHON3_CURSES + bool "curses" + help + curses module for host Python3. + config BR2_PACKAGE_HOST_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_HOST_OPENSSL diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 3a334fb28d87ca58a42abee6143b5735dfd600b7..0fdea8e6f8b7514b52c239f1f811428d919dfbec 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -22,7 +22,6 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ - --disable-curses \ --disable-codecs-cjk \ --disable-nis \ --enable-unicodedata \ @@ -49,6 +48,12 @@ else HOST_PYTHON3_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) +HOST_PYTHON3_DEPENDENCIES += host-ncurses +else +HOST_PYTHON3_CONF_OPTS += --disable-curses +endif + ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl else diff --git a/package/rpmsg-demo/rpmsg-demo.hash b/package/rpmsg-demo/rpmsg-demo.hash index 265bb772bb47c416280af76c606efe5fd2b0582a..88a0daa7a99677b1f944e05556310576411fe17b 100644 --- a/package/rpmsg-demo/rpmsg-demo.hash +++ b/package/rpmsg-demo/rpmsg-demo.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c5fb688bbe06eabebf2a1f3cb37d352e5bf3834e2f5116ecce51cda27dff4ac3 rpmsg-demo.c +sha256 0a5047784bf29880b8ed8fa3dbeef5e21a16854788cf96b12efae163212b02fd rpmsg-demo-single.c diff --git a/package/rpmsg-demo/rpmsg-demo.mk b/package/rpmsg-demo/rpmsg-demo.mk index 68e7bcb662f2aa9c25c969e6b955e7012ceea075..5cdedc7ef3998d4b070630d6563f85399f0effc4 100644 --- a/package/rpmsg-demo/rpmsg-demo.mk +++ b/package/rpmsg-demo/rpmsg-demo.mk @@ -5,18 +5,18 @@ ################################################################################ RPMSG_DEMO_SITE = https://gitee.com/phytium_embedded/phytium-embedded-docs/raw/master/open-amp -RPMSG_DEMO_SOURCE = rpmsg-demo.c +RPMSG_DEMO_SOURCE = rpmsg-demo-single.c define RPMSG_DEMO_EXTRACT_CMDS cp $(RPMSG_DEMO_DL_DIR)/$(RPMSG_DEMO_SOURCE) $(@D) endef define RPMSG_DEMO_BUILD_CMDS - $(TARGET_CC) -o $(@D)/rpmsg-demo $(@D)/$(RPMSG_DEMO_SOURCE) + $(TARGET_CC) -o $(@D)/rpmsg-demo-single $(@D)/$(RPMSG_DEMO_SOURCE) endef define RPMSG_DEMO_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/rpmsg-demo $(TARGET_DIR)/usr/bin/ + $(INSTALL) -m 0755 -D $(@D)/rpmsg-demo-single $(TARGET_DIR)/usr/bin/ endef $(eval $(generic-package))