This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit db85061b0b1d17e3c3c11414dcf30fb767ce109b
Author: Bowen Wang <wangbow...@xiaomi.com>
AuthorDate: Sun Feb 4 15:01:56 2024 +0800
sim/rpmsg: change SIM_RPTUN_MASTER to SIM_RPMSG_MASTER
Simply the config, later we can directly use macro SIM_RPMSG_MASTER
to controll all the rpmsg transport init.
Signed-off-by: Bowen Wang <wangbow...@xiaomi.com>
---
boards/sim/sim/sim/Kconfig | 6 +++---
boards/sim/sim/sim/configs/rpserver/defconfig | 2 +-
boards/sim/sim/sim/src/sim_bringup.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/boards/sim/sim/sim/Kconfig b/boards/sim/sim/sim/Kconfig
index a6b5474162..d68906cbd3 100644
--- a/boards/sim/sim/sim/Kconfig
+++ b/boards/sim/sim/sim/Kconfig
@@ -10,10 +10,10 @@ config EXAMPLES_TOUCHSCREEN_BGCOLOR
default 0x007b68ee
depends on EXAMPLES_TOUCHSCREEN
-config SIM_RPTUN_MASTER
- bool "Remote Processor Tunneling Role"
+config SIM_RPMSG_MASTER
+ bool "Rpmsg Master"
default n
- depends on RPTUN
+ depends on RPMSG
if SIM_TOUCHSCREEN
diff --git a/boards/sim/sim/sim/configs/rpserver/defconfig
b/boards/sim/sim/sim/configs/rpserver/defconfig
index e7f76515ca..de82d119c3 100644
--- a/boards/sim/sim/sim/configs/rpserver/defconfig
+++ b/boards/sim/sim/sim/configs/rpserver/defconfig
@@ -89,7 +89,7 @@ CONFIG_SIM_HOSTFS=y
CONFIG_SIM_M32=y
CONFIG_SIM_NETDEV=y
CONFIG_SIM_NET_BRIDGE=y
-CONFIG_SIM_RPTUN_MASTER=y
+CONFIG_SIM_RPMSG_MASTER=y
CONFIG_SIM_UART0_NAME="/dev/ttyUSB0"
CONFIG_SIM_UART_NUMBER=1
CONFIG_SYSLOG_PREFIX=y
diff --git a/boards/sim/sim/sim/src/sim_bringup.c
b/boards/sim/sim/sim/src/sim_bringup.c
index 77bb15e3eb..88481eaa4c 100644
--- a/boards/sim/sim/sim/src/sim_bringup.c
+++ b/boards/sim/sim/sim/src/sim_bringup.c
@@ -75,7 +75,7 @@
#ifdef CONFIG_RPMSG_UART
void rpmsg_serialinit(void)
{
-#ifdef CONFIG_SIM_RPTUN_MASTER
+#ifdef CONFIG_SIM_RPMSG_MASTER
uart_rpmsg_init("proxy", "proxy", 4096, false);
#else
uart_rpmsg_init("server", "proxy", 4096, true);
@@ -463,7 +463,7 @@ int sim_bringup(void)
#endif
#ifdef CONFIG_RPTUN
-# ifdef CONFIG_SIM_RPTUN_MASTER
+# ifdef CONFIG_SIM_RPMSG_MASTER
sim_rptun_init("server-proxy", "proxy",
SIM_RPTUN_MASTER | SIM_RPTUN_NOBOOT);
# else
