You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/11/08 13:18:34 UTC
[incubator-nuttx] branch master updated (bcafc77cf8 -> 33dabe3c38)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from bcafc77cf8 boards/esp32-lyrat: Add support for the ES8388 codec
new a446b5816f mm/circbuf: Remove MM_CIRCBUF option from Kconfig
new 38d1244751 mm/mempool: Remove MM_MEMPOOL option from Kconfig
new d6b5a345a4 mm: Let MM_SMALL and MM_REGIONS depend on MM_DEFAULT_MANAGER
new 33dabe3c38 sim: Always enable full UBSan feature to catch more error
The 4 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/phy62xx/phy6222/configs/nsh/defconfig | 1 -
boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig | 1 -
.../nucleo-h743zi/configs/mcuboot-loader/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/usb/defconfig | 1 -
boards/sim/sim/sim/scripts/Make.defs | 9 ++++-----
.../xtensa/esp32/esp32-devkitc/configs/audio/defconfig | 1 -
drivers/input/Kconfig | 2 --
drivers/ipcc/Kconfig | 1 -
drivers/rc/Kconfig | 1 -
drivers/sensors/Kconfig | 1 -
drivers/serial/Kconfig | 1 -
fs/procfs/fs_procfs.c | 2 +-
include/nuttx/mm/mempool.h | 8 ++++----
mm/Kconfig | 16 ++--------------
mm/circbuf/Make.defs | 2 --
mm/mempool/Make.defs | 7 -------
mm/mempool/mempool.c | 4 ++--
net/rpmsg/Kconfig | 1 -
20 files changed, 13 insertions(+), 49 deletions(-)
[incubator-nuttx] 03/04: mm: Let MM_SMALL and MM_REGIONS depend on MM_DEFAULT_MANAGER
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d6b5a345a47860b450a1128ae6e79e811ae9915f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 6 00:29:11 2022 +0800
mm: Let MM_SMALL and MM_REGIONS depend on MM_DEFAULT_MANAGER
since these options are coupled with the default heap implementation
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
mm/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/mm/Kconfig b/mm/Kconfig
index 414018532a..d604703581 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -51,6 +51,7 @@ config MM_KERNEL_HEAPSIZE
config MM_SMALL
bool "Small memory model"
default n
+ depends on MM_DEFAULT_MANAGER
---help---
Each memory allocation has a small allocation overhead. The size
of that overhead is normally determined by the "width" of the
[incubator-nuttx] 02/04: mm/mempool: Remove MM_MEMPOOL option from Kconfig
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 38d12447514a0c0380525b04374c1976c1362ea7
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 6 00:44:53 2022 +0800
mm/mempool: Remove MM_MEMPOOL option from Kconfig
since the linker can remove the unused object file from the final image
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
fs/procfs/fs_procfs.c | 2 +-
include/nuttx/mm/mempool.h | 8 ++++----
mm/Kconfig | 7 -------
mm/mempool/Make.defs | 7 -------
mm/mempool/mempool.c | 4 ++--
5 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/fs/procfs/fs_procfs.c b/fs/procfs/fs_procfs.c
index 41ecc05a04..76be822222 100644
--- a/fs/procfs/fs_procfs.c
+++ b/fs/procfs/fs_procfs.c
@@ -114,7 +114,7 @@ static const struct procfs_entry_s g_procfs_entries[] =
# endif
#endif
-#if defined(CONFIG_MM_MEMPOOL) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
+#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
{ "mempool", &mempool_operations, PROCFS_FILE_TYPE },
#endif
diff --git a/include/nuttx/mm/mempool.h b/include/nuttx/mm/mempool.h
index e06db286ad..e42610a597 100644
--- a/include/nuttx/mm/mempool.h
+++ b/include/nuttx/mm/mempool.h
@@ -42,7 +42,7 @@ typedef CODE void *(*mempool_alloc_t)(FAR struct mempool_s *pool,
typedef CODE void (*mempool_free_t)(FAR struct mempool_s *pool,
FAR void *addr);
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
struct mempool_procfs_entry_s
{
FAR const char *name;
@@ -70,7 +70,7 @@ struct mempool_s
size_t nused; /* The number of used block in mempool */
spinlock_t lock; /* The protect lock to mempool */
sem_t waitsem; /* The semaphore of waiter get free block */
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
struct mempool_procfs_entry_s procfs; /* The entry of procfs */
#endif
};
@@ -195,7 +195,7 @@ int mempool_deinit(FAR struct mempool_s *pool);
*
****************************************************************************/
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
void mempool_procfs_register(FAR struct mempool_procfs_entry_s *entry,
FAR const char *name);
#endif
@@ -211,7 +211,7 @@ void mempool_procfs_register(FAR struct mempool_procfs_entry_s *entry,
*
****************************************************************************/
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
void mempool_procfs_unregister(FAR struct mempool_procfs_entry_s *entry);
#endif
diff --git a/mm/Kconfig b/mm/Kconfig
index 2c3281016e..414018532a 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -165,13 +165,6 @@ config MM_SHM
Build in support for the shared memory interfaces shmget(), shmat(),
shmctl(), and shmdt().
-config MM_MEMPOOL
- bool "Enable memory buffer pool"
- default n
- ---help---
- Memory buffer pool support. Such pools are mostly used
- for guaranteed, deadlock-free memory allocations.
-
config FS_PROCFS_EXCLUDE_MEMPOOL
bool "Exclude mempool"
default DEFAULT_SMALL
diff --git a/mm/mempool/Make.defs b/mm/mempool/Make.defs
index 7dd172b7d2..565b4b1cd0 100644
--- a/mm/mempool/Make.defs
+++ b/mm/mempool/Make.defs
@@ -20,22 +20,15 @@
# Memory buffer pool management
-ifeq ($(CONFIG_MM_MEMPOOL),y)
-
CSRCS += mempool.c mempool_multiple.c
ifeq ($(CONFIG_FS_PROCFS),y)
-
ifneq ($(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL),y)
-
CSRCS += mempool_procfs.c
-
endif
-
endif
# Add the memory buffer pool directory to the build
DEPPATH += --dep-path mempool
VPATH += :mempool
-endif
diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c
index 5df30fae14..6d359e3ff6 100644
--- a/mm/mempool/mempool.c
+++ b/mm/mempool/mempool.c
@@ -125,7 +125,7 @@ int mempool_init(FAR struct mempool_s *pool, FAR const char *name)
nxsem_init(&pool->waitsem, 0, 0);
}
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
mempool_procfs_register(&pool->procfs, name);
#endif
@@ -323,7 +323,7 @@ int mempool_deinit(FAR struct mempool_s *pool)
return -EBUSY;
}
-#ifndef CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL
+#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_MEMPOOL)
mempool_procfs_unregister(&pool->procfs);
#endif
[incubator-nuttx] 01/04: mm/circbuf: Remove MM_CIRCBUF option from Kconfig
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a446b5816f8159f134730e1d8fedc5984ced874b
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 6 00:18:52 2022 +0800
mm/circbuf: Remove MM_CIRCBUF option from Kconfig
since the linker can remove the unused object file from the final image
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/phy62xx/phy6222/configs/nsh/defconfig | 1 -
boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig | 1 -
boards/arm/stm32h7/nucleo-h743zi/configs/mcuboot-loader/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig | 1 -
boards/risc-v/mpfs/icicle/configs/usb/defconfig | 1 -
boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig | 1 -
drivers/input/Kconfig | 2 --
drivers/ipcc/Kconfig | 1 -
drivers/rc/Kconfig | 1 -
drivers/sensors/Kconfig | 1 -
drivers/serial/Kconfig | 1 -
mm/Kconfig | 6 ------
mm/circbuf/Make.defs | 2 --
net/rpmsg/Kconfig | 1 -
15 files changed, 22 deletions(-)
diff --git a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
index 5e6d444442..ade0b7c7d6 100644
--- a/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
+++ b/boards/arm/phy62xx/phy6222/configs/nsh/defconfig
@@ -25,7 +25,6 @@ CONFIG_DEFAULT_SMALL=y
CONFIG_FS_LITTLEFS=y
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_STACKSIZE=1536
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_SMALL=y
CONFIG_MTD=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
diff --git a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
index 0388873094..601b10bcf8 100644
--- a/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
+++ b/boards/arm/phy62xx/phy6222/configs/phy_sbp/defconfig
@@ -52,7 +52,6 @@ CONFIG_INTELHEX_BINARY=y
CONFIG_IOEXPANDER=y
CONFIG_IOEXPANDER_MULTIPIN=y
CONFIG_LIBC_EXECFUNCS=y
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_SMALL=y
CONFIG_MTD=y
CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/mcuboot-loader/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/mcuboot-loader/defconfig
index 929068b5ed..ee187c5be1 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/mcuboot-loader/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/mcuboot-loader/defconfig
@@ -37,7 +37,6 @@ CONFIG_INTELHEX_BINARY=y
CONFIG_LIBM=y
CONFIG_MCUBOOT_BOOTLOADER=y
CONFIG_MCUBOOT_VERSION="414ac87cfd8d9cedeb781f812ad6f5072e6d8a39"
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_IOB=y
CONFIG_MM_REGIONS=4
CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
index 66b9767900..cd526cb972 100644
--- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig
@@ -48,7 +48,6 @@ CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_IOB=y
CONFIG_MPFS_IHC_CLIENT=y
CONFIG_MPFS_IHC_LINUX_ON_HART4=0
diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
index 56989f679c..5dc95abc1f 100644
--- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig
@@ -48,7 +48,6 @@ CONFIG_LIBC_PERROR_STDOUT=y
CONFIG_LIBC_STRERROR=y
CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_IOB=y
CONFIG_MPFS_IHC_CLIENT=y
CONFIG_MPFS_IHC_LINUX_ON_HART3=0
diff --git a/boards/risc-v/mpfs/icicle/configs/usb/defconfig b/boards/risc-v/mpfs/icicle/configs/usb/defconfig
index d0882bcc62..75ebea256e 100644
--- a/boards/risc-v/mpfs/icicle/configs/usb/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/usb/defconfig
@@ -62,7 +62,6 @@ CONFIG_MEMSET_64BIT=y
CONFIG_MEMSET_OPTSPEED=y
CONFIG_MMCSD=y
CONFIG_MMCSD_SDIO=y
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_IOB=y
CONFIG_MPFS_EMMCSD=y
CONFIG_MPFS_UART2=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
index d9d634bd01..4d284f2fe8 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/audio/defconfig
@@ -71,7 +71,6 @@ CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_NBUFFERS=24
CONFIG_IOB_THROTTLE=0
-CONFIG_MM_CIRCBUF=y
CONFIG_MM_REGIONS=3
CONFIG_NAME_MAX=48
CONFIG_NETDB_DNSCLIENT=y
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index f2f5f26cea..00eecb45fe 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -32,12 +32,10 @@ endif # INPUT_MOUSE
config INPUT_TOUCHSCREEN
bool
- select MM_CIRCBUF
default n
config INPUT_KEYBOARD
bool
- select MM_CIRCBUF
default n
config INPUT_UINPUT
diff --git a/drivers/ipcc/Kconfig b/drivers/ipcc/Kconfig
index 1dbd87c330..52612aae0e 100644
--- a/drivers/ipcc/Kconfig
+++ b/drivers/ipcc/Kconfig
@@ -1,6 +1,5 @@
menuconfig IPCC
bool "IPCC (Inter Processor Communication Controller) driver"
- select MM_CIRCBUF
depends on EXPERIMENTAL
default n
---help---
diff --git a/drivers/rc/Kconfig b/drivers/rc/Kconfig
index 9e4a5d4261..65cf457181 100644
--- a/drivers/rc/Kconfig
+++ b/drivers/rc/Kconfig
@@ -5,7 +5,6 @@
menuconfig DRIVERS_RC
bool "Remote Control Device Support"
- select MM_CIRCBUF
default n
---help---
Drivers for various remote control
diff --git a/drivers/sensors/Kconfig b/drivers/sensors/Kconfig
index c3033070ac..2b229964fc 100644
--- a/drivers/sensors/Kconfig
+++ b/drivers/sensors/Kconfig
@@ -5,7 +5,6 @@
menuconfig SENSORS
bool "Sensor Device Support"
- select MM_CIRCBUF
default n
---help---
Drivers for various sensors
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index f86f681ec2..4cd31f3f86 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -714,7 +714,6 @@ endif # PSEUDOTERM
menuconfig UART_BTH4
bool "BT H4 uart pseudo device"
default n
- select MM_CIRCBUF
---help---
Enable support for Bluetooth H4 UART Pseudo Device(eg. /dev/ttyHCI).
This instantiates a serial-like interface over an existing bluetooth
diff --git a/mm/Kconfig b/mm/Kconfig
index 3193de8653..2c3281016e 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -165,12 +165,6 @@ config MM_SHM
Build in support for the shared memory interfaces shmget(), shmat(),
shmctl(), and shmdt().
-config MM_CIRCBUF
- bool "Circular buffer support"
- default n
- ---help---
- Build in support for the circular buffer management.
-
config MM_MEMPOOL
bool "Enable memory buffer pool"
default n
diff --git a/mm/circbuf/Make.defs b/mm/circbuf/Make.defs
index 1d71c24fbc..45dcb862bb 100644
--- a/mm/circbuf/Make.defs
+++ b/mm/circbuf/Make.defs
@@ -20,11 +20,9 @@
# Circular buffer management
-ifeq ($(CONFIG_MM_CIRCBUF),y)
CSRCS += circbuf.c
# Add the circular buffer directory to the build
DEPPATH += --dep-path circbuf
VPATH += :circbuf
-endif
diff --git a/net/rpmsg/Kconfig b/net/rpmsg/Kconfig
index bb57f5c75e..d8aa5e1ff4 100644
--- a/net/rpmsg/Kconfig
+++ b/net/rpmsg/Kconfig
@@ -9,7 +9,6 @@ menu "Rpmsg Socket Support"
config NET_RPMSG
bool "Rpmsg domain (remote) sockets"
depends on RPTUN
- select MM_CIRCBUF
default n
---help---
Enable or disable Rpmsg (aka remote) sockets.
[incubator-nuttx] 04/04: sim: Always enable full UBSan feature to catch more error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 33dabe3c38eb6293ed28b19b131ebd55033890bb
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Nov 6 00:34:01 2022 +0800
sim: Always enable full UBSan feature to catch more error
since the resource is plenty on simulator
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/sim/sim/sim/scripts/Make.defs | 9 ++++-----
mm/Kconfig | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index ef4b1462b9..686d2dd660 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -78,13 +78,12 @@ else ifeq ($(CONFIG_MM_KASAN_ALL),y)
endif
ifeq ($(CONFIG_SIM_UBSAN),y)
- ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
+ ARCHOPTIMIZATION += -fsanitize=undefined
else ifeq ($(CONFIG_MM_UBSAN_ALL),y)
ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
-endif
-
-ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)
- ARCHOPTIMIZATION += -fsanitize-undefined-trap-on-error
+ ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)
+ ARCHOPTIMIZATION += -fsanitize-undefined-trap-on-error
+ endif
endif
# Add -fno-common because macOS "ld -r" doesn't seem to pick objects
diff --git a/mm/Kconfig b/mm/Kconfig
index d604703581..21950a696d 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -212,7 +212,7 @@ config MM_UBSAN_ALL
config MM_UBSAN_OPTION
string "UBSan options"
- depends on MM_UBSAN || SIM_UBSAN
+ depends on MM_UBSAN
default "-fsanitize=undefined"
---help---
This option activates specified UBSan instrumentation. Please