You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/01/29 11:55:00 UTC
[nuttx] branch master updated: arm/itm_syslog: remove invaild select config
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
The following commit(s) were added to refs/heads/master by this push:
new 82520c0006 arm/itm_syslog: remove invaild select config
82520c0006 is described below
commit 82520c000648e9978bff6c2cff3c36a946fc7363
Author: chao an <an...@xiaomi.com>
AuthorDate: Sun Jan 29 15:43:55 2023 +0800
arm/itm_syslog: remove invaild select config
1. CONFIG_SYSLOG has been removed by Nutt on below commit:
| commit c5ac473bc06aadca3d2015fd0608d59eb45fc9a5
| Author: Gregory Nutt <gn...@nuttx.org>
| Date: Tue Jun 21 07:58:42 2016 -0600
|
| SYSLOG: Remove an obsolete, unused configuration item from Kconfig file
2. Fix comile warning
| armv7-m/arm_itm_syslog.c: In function 'itm_syslog_initialize':
| armv7-m/arm_itm_syslog.c:183:18: warning: passing argument 1 of 'syslog_channel' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
| 183 | syslog_channel(&g_itm_channel);
| | ^~~~~~~~~~~~~~
| In file included from armv7-m/arm_itm_syslog.c:29:
| nuttx/syslog/syslog.h:155:49: note: expected 'struct syslog_channel_s *' but argument is of type 'const struct syslog_channel_s *'
| 155 | int syslog_channel(FAR struct syslog_channel_s *channel);
| |
Signed-off-by: chao an <an...@xiaomi.com>
---
arch/arm/src/armv7-m/Kconfig | 1 -
arch/arm/src/armv7-m/arm_itm_syslog.c | 2 +-
arch/arm/src/armv8-m/Kconfig | 1 -
arch/arm/src/armv8-m/arm_itm_syslog.c | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig
index b1ca99f116..f7aec0382f 100644
--- a/arch/arm/src/armv7-m/Kconfig
+++ b/arch/arm/src/armv7-m/Kconfig
@@ -130,7 +130,6 @@ config ARMV7M_ITMSYSLOG
bool "ITM SYSLOG support"
default n
select ARCH_SYSLOG
- select SYSLOG
---help---
Enable hooks to support ITM syslog output. This requires additional
MCU support in order to be used. See arch/arm/src/armv7-m/itm_syslog.h
diff --git a/arch/arm/src/armv7-m/arm_itm_syslog.c b/arch/arm/src/armv7-m/arm_itm_syslog.c
index 366d8aad4a..b68640a402 100644
--- a/arch/arm/src/armv7-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv7-m/arm_itm_syslog.c
@@ -80,7 +80,7 @@ static const struct syslog_channel_ops_s g_itm_channel_ops =
/* This structure describes the ITM SYSLOG channel */
-static const struct syslog_channel_s g_itm_channel =
+static struct syslog_channel_s g_itm_channel =
{
.sc_ops = &g_itm_channel_ops
};
diff --git a/arch/arm/src/armv8-m/Kconfig b/arch/arm/src/armv8-m/Kconfig
index 550509281c..064d09c47c 100644
--- a/arch/arm/src/armv8-m/Kconfig
+++ b/arch/arm/src/armv8-m/Kconfig
@@ -129,7 +129,6 @@ config ARMV8M_ITMSYSLOG
bool "ITM SYSLOG support"
default n
select ARCH_SYSLOG
- select SYSLOG
---help---
Enable hooks to support ITM syslog output. This requires additional
MCU support in order to be used. See arch/arm/src/armv8-m/itm_syslog.h
diff --git a/arch/arm/src/armv8-m/arm_itm_syslog.c b/arch/arm/src/armv8-m/arm_itm_syslog.c
index 9900de225e..d3fba562dc 100644
--- a/arch/arm/src/armv8-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv8-m/arm_itm_syslog.c
@@ -80,7 +80,7 @@ static const struct syslog_channel_ops_s g_itm_channel_ops =
/* This structure describes the ITM SYSLOG channel */
-static const struct syslog_channel_s g_itm_channel =
+static struct syslog_channel_s g_itm_channel =
{
.sc_ops = &g_itm_channel_ops
};