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/11/30 14:16:18 UTC
(nuttx) branch master updated (3d57055057 -> 7b1f22ca18)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 3d57055057 libc/arm: add support of PACBTI
new 09c17fcfa8 segger/rtt: correct macro name to avoid unable to change default mode
new 7b1f22ca18 xmc4/spi: fix typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c | 2 +-
boards/risc-v/bl602/bl602evb/src/bl602_bringup.c | 2 +-
drivers/segger/config/SEGGER_RTT_Conf.h | 2 +-
fs/nfs/Kconfig | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
(nuttx) 02/02: xmc4/spi: fix typo
Posted by xi...@apache.org.
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 7b1f22ca182e105bc304b93b7dc7bb729b709a0d
Author: chao an <an...@xiaomi.com>
AuthorDate: Thu Nov 30 17:15:02 2023 +0800
xmc4/spi: fix typo
Signed-off-by: chao an <an...@xiaomi.com>
---
boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c | 2 +-
boards/risc-v/bl602/bl602evb/src/bl602_bringup.c | 2 +-
fs/nfs/Kconfig | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c
index a160c8c998..7389388e82 100644
--- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c
+++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c
@@ -60,7 +60,7 @@ void weak_function xmc4_spidev_initialize(void)
/* Configure SPI2 chip selects */
-#if define(CONFIG_XMC4_SPI2) && defined(CONFIG_SENSORS_MAX6675)
+#if defined(CONFIG_XMC4_SPI2) && defined(CONFIG_SENSORS_MAX6675)
xmc4_gpio_config(GPIO_CS_MAX6675);
#endif
diff --git a/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c b/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
index 3394c114df..0ee41b2bbe 100644
--- a/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
+++ b/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
@@ -324,7 +324,7 @@ int bthci_register(void)
ret = uart_bth4_register("/dev/ttyHCI0", &hci_dev->drv);
#elif defined(CONFIG_NET_BLUETOOTH)
ret = bt_netdev_register(&hci_dev->drv);
- #elif defined(BL602_BLE_CONTROLLER)
+ #elif defined(CONFIG_BL602_BLE_CONTROLLER)
#error "Must select CONFIG_UART_BTH4 or CONFIG_NET_BLUETOOTH"
#endif
if (ret < 0)
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index fcc6483d75..5c345a875c 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -11,7 +11,7 @@ config NFS
---help---
Enable network file system (NFS) client file system
-#if NFS
+if NFS
config NFS_DONT_BIND_TCP_SOCKET
bool
@@ -31,4 +31,4 @@ config NFS_STATISTICS
obtain these statistics, however. So they would only be of value
if you add debug instrumentation or use a debugger.
-#endif
+endif
(nuttx) 01/02: segger/rtt: correct macro name to avoid unable to change default mode
Posted by xi...@apache.org.
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 09c17fcfa8bf24d71c5a28758a81427572f74eb1
Author: chao an <an...@xiaomi.com>
AuthorDate: Thu Nov 30 16:59:51 2023 +0800
segger/rtt: correct macro name to avoid unable to change default mode
SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL should be CONFIG_SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
Signed-off-by: chao an <an...@xiaomi.com>
---
drivers/segger/config/SEGGER_RTT_Conf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/segger/config/SEGGER_RTT_Conf.h b/drivers/segger/config/SEGGER_RTT_Conf.h
index 9f6d7d3399..aab7e24c22 100644
--- a/drivers/segger/config/SEGGER_RTT_Conf.h
+++ b/drivers/segger/config/SEGGER_RTT_Conf.h
@@ -65,7 +65,7 @@
#if defined(CONFIG_SEGGER_RTT_MODE_NO_BLOCK_TRIM)
# define SEGGER_RTT_MODE_DEFAULT SEGGER_RTT_MODE_NO_BLOCK_TRIM
-#elif defined(SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL)
+#elif defined(CONFIG_SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL)
# define SEGGER_RTT_MODE_DEFAULT SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
#else
# define SEGGER_RTT_MODE_DEFAULT SEGGER_RTT_MODE_NO_BLOCK_SKIP