diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index 62641b434d..7f2888763f 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -1661,7 +1661,7 @@ config STM32_CCMEXCLUDE config STM32_CCM_PROCFS bool "CCM PROCFS support" default n - depends on STM32_CCMEXCLUDE && MM_MULTIHEAP && FS_PROCFS + depends on STM32_CCMEXCLUDE && FS_PROCFS ---help--- Select to build in support for /proc/ccm. Reading from /proc/ccm will provide statistics about CCM memory use similar to what you diff --git a/arch/arm/src/stm32/stm32_ccm.h b/arch/arm/src/stm32/stm32_ccm.h index 1314210635..9b5041bc1e 100755 --- a/arch/arm/src/stm32/stm32_ccm.h +++ b/arch/arm/src/stm32/stm32_ccm.h @@ -66,10 +66,10 @@ #endif /* In order to use the CCM heap, it had to have been excluded from the main - * heap and support for multiple heaps must have been enabled. + * heap. */ -#if !defined(CONFIG_STM32_CCMEXCLUDE) || !defined(CONFIG_MM_MULTIHEAP) +#ifndef CONFIG_STM32_CCMEXCLUDE # undef HAVE_CCM_HEAP #endif diff --git a/configs/16z/nsh/defconfig b/configs/16z/nsh/defconfig index 65b5561e8f..a667f239ff 100644 --- a/configs/16z/nsh/defconfig +++ b/configs/16z/nsh/defconfig @@ -399,7 +399,6 @@ CONFIG_UART0_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig index 41841a2c9b..f5a81f891a 100644 --- a/configs/amber/hello/defconfig +++ b/configs/amber/hello/defconfig @@ -311,7 +311,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig index e9ab03011e..493cceefcb 100644 --- a/configs/arduino-due/nsh/defconfig +++ b/configs/arduino-due/nsh/defconfig @@ -398,7 +398,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 # CONFIG_GRAN is not set diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig index c3f3900bc8..3a6b352774 100644 --- a/configs/avr32dev1/nsh/defconfig +++ b/configs/avr32dev1/nsh/defconfig @@ -358,7 +358,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig index 9fa49ead0f..87c59210aa 100644 --- a/configs/avr32dev1/ostest/defconfig +++ b/configs/avr32dev1/ostest/defconfig @@ -348,7 +348,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig index a9aeb224b5..9915cc3acf 100644 --- a/configs/c5471evm/httpd/defconfig +++ b/configs/c5471evm/httpd/defconfig @@ -399,7 +399,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig index fb6f7d8f55..33b0d153a6 100644 --- a/configs/c5471evm/nettest/defconfig +++ b/configs/c5471evm/nettest/defconfig @@ -397,7 +397,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig index bfd3734ed7..c1e31dac5f 100644 --- a/configs/c5471evm/nsh/defconfig +++ b/configs/c5471evm/nsh/defconfig @@ -404,7 +404,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig index c137a78101..d136ee73ed 100644 --- a/configs/cc3200-launchpad/nsh/defconfig +++ b/configs/cc3200-launchpad/nsh/defconfig @@ -470,7 +470,6 @@ CONFIG_FS_PROCFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig index 5ef2cd713f..9523d66962 100644 --- a/configs/compal_e86/nsh_highram/defconfig +++ b/configs/compal_e86/nsh_highram/defconfig @@ -335,7 +335,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig index 3378b8cdc5..f6ba797303 100644 --- a/configs/compal_e88/nsh_highram/defconfig +++ b/configs/compal_e88/nsh_highram/defconfig @@ -361,7 +361,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig index 3e9c217ad9..30bc47674a 100644 --- a/configs/compal_e99/nsh_compalram/defconfig +++ b/configs/compal_e99/nsh_compalram/defconfig @@ -366,7 +366,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig index 1efa2bf1a6..4c07ac111d 100644 --- a/configs/compal_e99/nsh_highram/defconfig +++ b/configs/compal_e99/nsh_highram/defconfig @@ -453,7 +453,6 @@ CONFIG_NXFONT_SANS17X22=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig index 31a9413354..dcf4490ca7 100644 --- a/configs/demo9s12ne64/ostest/defconfig +++ b/configs/demo9s12ne64/ostest/defconfig @@ -304,7 +304,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig index eccd7f5f73..a7fe7aba01 100644 --- a/configs/ea3131/nsh/defconfig +++ b/configs/ea3131/nsh/defconfig @@ -466,7 +466,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig index 2982fdce3d..3f7b75b62f 100644 --- a/configs/ea3131/pgnsh/defconfig +++ b/configs/ea3131/pgnsh/defconfig @@ -529,7 +529,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig index dd78cd02e5..e83f76b92f 100644 --- a/configs/ea3131/usbserial/defconfig +++ b/configs/ea3131/usbserial/defconfig @@ -506,7 +506,6 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig index 09a5d33da6..55d04491a5 100644 --- a/configs/ea3152/ostest/defconfig +++ b/configs/ea3152/ostest/defconfig @@ -455,7 +455,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig index 0fada532c2..a577741cea 100644 --- a/configs/eagle100/httpd/defconfig +++ b/configs/eagle100/httpd/defconfig @@ -466,7 +466,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig index ae67b8538a..09ac7417cc 100644 --- a/configs/eagle100/nettest/defconfig +++ b/configs/eagle100/nettest/defconfig @@ -513,7 +513,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig index 29826f8914..804e2d1b9d 100644 --- a/configs/eagle100/nsh/defconfig +++ b/configs/eagle100/nsh/defconfig @@ -519,7 +519,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig index 968c45bc1c..aa5c56b0b7 100644 --- a/configs/eagle100/nxflat/defconfig +++ b/configs/eagle100/nxflat/defconfig @@ -421,7 +421,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig index 344e817d2e..869e0a73d5 100644 --- a/configs/eagle100/thttpd/defconfig +++ b/configs/eagle100/thttpd/defconfig @@ -463,7 +463,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig index 534dbb245d..fc2f98f90e 100644 --- a/configs/ekk-lm3s9b96/nsh/defconfig +++ b/configs/ekk-lm3s9b96/nsh/defconfig @@ -506,7 +506,6 @@ CONFIG_NFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index ef14196f3a..5e5f743a4a 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -370,7 +370,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig index 2e46b3e021..037a69f7df 100644 --- a/configs/ez80f910200zco/dhcpd/defconfig +++ b/configs/ez80f910200zco/dhcpd/defconfig @@ -457,7 +457,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig index 8c0ee7405d..92aabe69f9 100644 --- a/configs/ez80f910200zco/httpd/defconfig +++ b/configs/ez80f910200zco/httpd/defconfig @@ -468,7 +468,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig index 3aba3d92f8..c4e3aaf397 100644 --- a/configs/ez80f910200zco/nettest/defconfig +++ b/configs/ez80f910200zco/nettest/defconfig @@ -466,7 +466,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig index 77dd53dbd3..eb410e6f9a 100644 --- a/configs/ez80f910200zco/nsh/defconfig +++ b/configs/ez80f910200zco/nsh/defconfig @@ -479,7 +479,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig index 54ec48a73b..da41147e25 100644 --- a/configs/ez80f910200zco/poll/defconfig +++ b/configs/ez80f910200zco/poll/defconfig @@ -468,7 +468,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig index bc05cab765..2ae28384ef 100644 --- a/configs/freedom-kl25z/minnsh/defconfig +++ b/configs/freedom-kl25z/minnsh/defconfig @@ -380,7 +380,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig index 47d931f8b0..fbbcbb0a28 100644 --- a/configs/freedom-kl25z/nsh/defconfig +++ b/configs/freedom-kl25z/nsh/defconfig @@ -368,7 +368,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig index 9e5e03b502..1aec7f4e37 100644 --- a/configs/hymini-stm32v/buttons/defconfig +++ b/configs/hymini-stm32v/buttons/defconfig @@ -418,7 +418,6 @@ CONFIG_USART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig index 589620e605..c125f7c06f 100644 --- a/configs/hymini-stm32v/nsh/defconfig +++ b/configs/hymini-stm32v/nsh/defconfig @@ -441,7 +441,6 @@ CONFIG_FAT_LCNAMES=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index e3e596621a..18057eaa60 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -585,7 +585,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig index a8563d52d8..144e5186df 100644 --- a/configs/hymini-stm32v/usbmsc/defconfig +++ b/configs/hymini-stm32v/usbmsc/defconfig @@ -581,7 +581,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig index 62f0ad0b1b..989224f855 100644 --- a/configs/hymini-stm32v/usbnsh/defconfig +++ b/configs/hymini-stm32v/usbnsh/defconfig @@ -460,7 +460,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig index 113aee55d4..2426bbffdd 100644 --- a/configs/hymini-stm32v/usbserial/defconfig +++ b/configs/hymini-stm32v/usbserial/defconfig @@ -563,7 +563,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig index fc70a16d52..5627765f3a 100644 --- a/configs/kwikstik-k40/ostest/defconfig +++ b/configs/kwikstik-k40/ostest/defconfig @@ -368,7 +368,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig index 40ca3c9f10..280e8c4b24 100644 --- a/configs/lincoln60/nsh/defconfig +++ b/configs/lincoln60/nsh/defconfig @@ -430,7 +430,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig index 5e91a19c21..87a549dc76 100644 --- a/configs/lm3s6432-s2e/nsh/defconfig +++ b/configs/lm3s6432-s2e/nsh/defconfig @@ -498,7 +498,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig index 4e91411027..94cf49964b 100644 --- a/configs/lm3s6965-ek/discover/defconfig +++ b/configs/lm3s6965-ek/discover/defconfig @@ -511,7 +511,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig index 4e91411027..94cf49964b 100644 --- a/configs/lm3s6965-ek/nsh/defconfig +++ b/configs/lm3s6965-ek/nsh/defconfig @@ -511,7 +511,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig index 1ab033117b..fa77c163d7 100644 --- a/configs/lm3s6965-ek/nx/defconfig +++ b/configs/lm3s6965-ek/nx/defconfig @@ -512,7 +512,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig index 00fec2c5d4..03d6b1d01f 100644 --- a/configs/lm3s6965-ek/tcpecho/defconfig +++ b/configs/lm3s6965-ek/tcpecho/defconfig @@ -515,7 +515,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig index a1e5262397..488c428d2d 100644 --- a/configs/lm3s8962-ek/nsh/defconfig +++ b/configs/lm3s8962-ek/nsh/defconfig @@ -519,7 +519,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig index 39969b0c29..56c7bb10f1 100644 --- a/configs/lm3s8962-ek/nx/defconfig +++ b/configs/lm3s8962-ek/nx/defconfig @@ -520,7 +520,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig index 96e56c6bb0..4f31c7f709 100644 --- a/configs/lm4f120-launchpad/nsh/defconfig +++ b/configs/lm4f120-launchpad/nsh/defconfig @@ -425,7 +425,6 @@ CONFIG_UART0_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig index aa03487e41..a7c4a0a322 100644 --- a/configs/lpc4330-xplorer/nsh/defconfig +++ b/configs/lpc4330-xplorer/nsh/defconfig @@ -439,7 +439,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig index 27af17ebeb..ed0eddee73 100644 --- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -528,7 +528,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig index 4175d88d9b..1a4edc6403 100644 --- a/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -596,7 +596,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig index 00f08d37e9..58c2a6406b 100644 --- a/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/configs/lpcxpresso-lpc1768/nx/defconfig @@ -573,7 +573,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig index ec973c2646..027cf873e2 100644 --- a/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -541,7 +541,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig index 260850134d..9e4a99d736 100644 --- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig +++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig @@ -529,7 +529,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig index 247a9a0c8d..b567df94f8 100644 --- a/configs/maple/nsh/defconfig +++ b/configs/maple/nsh/defconfig @@ -521,7 +521,6 @@ CONFIG_USBDEV_TRACE_NRECORDS=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig index 4108751c72..c9acf7a249 100644 --- a/configs/maple/nx/defconfig +++ b/configs/maple/nx/defconfig @@ -667,7 +667,6 @@ CONFIG_NXFONT_MONO5X8=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig index ad61bc38c2..9b592cffe8 100644 --- a/configs/maple/usbnsh/defconfig +++ b/configs/maple/usbnsh/defconfig @@ -547,7 +547,6 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig index ea25a28391..44045f75ce 100644 --- a/configs/mbed/hidkbd/defconfig +++ b/configs/mbed/hidkbd/defconfig @@ -451,7 +451,6 @@ CONFIG_HIDKBD_NPOLLWAITERS=2 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig index c999f49d18..6e792f4e69 100644 --- a/configs/mbed/nsh/defconfig +++ b/configs/mbed/nsh/defconfig @@ -467,7 +467,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig index 76d3cf493d..652e29de86 100644 --- a/configs/mcu123-lpc214x/composite/defconfig +++ b/configs/mcu123-lpc214x/composite/defconfig @@ -464,7 +464,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig index 2aff2c127c..9df87f46a9 100644 --- a/configs/mcu123-lpc214x/usbmsc/defconfig +++ b/configs/mcu123-lpc214x/usbmsc/defconfig @@ -440,7 +440,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig index df6737c4f8..cd33829a9c 100644 --- a/configs/mcu123-lpc214x/usbserial/defconfig +++ b/configs/mcu123-lpc214x/usbserial/defconfig @@ -428,7 +428,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig index 077666e23d..ae1ca03ef9 100644 --- a/configs/micropendous3/hello/defconfig +++ b/configs/micropendous3/hello/defconfig @@ -319,7 +319,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig index a4b14839a9..0d41d1bb48 100644 --- a/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/configs/mikroe-stm32f4/fulldemo/defconfig @@ -827,7 +827,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig index 04072f314f..a2e98088e9 100644 --- a/configs/mikroe-stm32f4/kostest/defconfig +++ b/configs/mikroe-stm32f4/kostest/defconfig @@ -760,7 +760,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig index fdb8258f5f..b8bc74f377 100644 --- a/configs/mikroe-stm32f4/nsh/defconfig +++ b/configs/mikroe-stm32f4/nsh/defconfig @@ -619,7 +619,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig index afa0d51bc4..aac9ab6b24 100644 --- a/configs/mikroe-stm32f4/nx/defconfig +++ b/configs/mikroe-stm32f4/nx/defconfig @@ -590,7 +590,6 @@ CONFIG_NXFONT_SERIF22X28B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig index 19b82a40ab..300414f68c 100644 --- a/configs/mikroe-stm32f4/nxlines/defconfig +++ b/configs/mikroe-stm32f4/nxlines/defconfig @@ -590,7 +590,6 @@ CONFIG_NXFONT_SERIF22X28B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig index a5e475d9b1..62f6282982 100644 --- a/configs/mikroe-stm32f4/nxtext/defconfig +++ b/configs/mikroe-stm32f4/nxtext/defconfig @@ -590,7 +590,6 @@ CONFIG_NXFONT_SERIF22X28B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig index 97723c7fd6..cae9a05560 100644 --- a/configs/mikroe-stm32f4/usbnsh/defconfig +++ b/configs/mikroe-stm32f4/usbnsh/defconfig @@ -666,7 +666,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig index 1e381135c5..72fcc4c971 100644 --- a/configs/mirtoo/nsh/defconfig +++ b/configs/mirtoo/nsh/defconfig @@ -483,7 +483,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig index 55e0968683..7890a545e3 100644 --- a/configs/mirtoo/nxffs/defconfig +++ b/configs/mirtoo/nxffs/defconfig @@ -527,7 +527,6 @@ CONFIG_NXFFS_TAILTHRESHOLD=8192 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig index 0c3de291f1..8bfaf533f6 100644 --- a/configs/mx1ads/ostest/defconfig +++ b/configs/mx1ads/ostest/defconfig @@ -421,7 +421,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig index d9e4a28217..ab72db8287 100644 --- a/configs/ne64badge/ostest/defconfig +++ b/configs/ne64badge/ostest/defconfig @@ -304,7 +304,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig index 8376adb0ab..606b6bb48e 100644 --- a/configs/ntosd-dm320/nettest/defconfig +++ b/configs/ntosd-dm320/nettest/defconfig @@ -535,7 +535,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig index 4d26e3532e..1de9cdf04b 100644 --- a/configs/ntosd-dm320/nsh/defconfig +++ b/configs/ntosd-dm320/nsh/defconfig @@ -564,7 +564,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig index b2923d178e..3bd803d4b9 100644 --- a/configs/ntosd-dm320/poll/defconfig +++ b/configs/ntosd-dm320/poll/defconfig @@ -543,7 +543,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig index 82e60d335b..7677d216de 100644 --- a/configs/ntosd-dm320/thttpd/defconfig +++ b/configs/ntosd-dm320/thttpd/defconfig @@ -542,7 +542,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig index aa82d7f79b..97b87765bf 100644 --- a/configs/ntosd-dm320/udp/defconfig +++ b/configs/ntosd-dm320/udp/defconfig @@ -527,7 +527,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig index aaa1a6fb9b..990fd4ee10 100644 --- a/configs/ntosd-dm320/webserver/defconfig +++ b/configs/ntosd-dm320/webserver/defconfig @@ -538,7 +538,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/nucleo-f401re/nsh/defconfig b/configs/nucleo-f401re/nsh/defconfig index 4d59c71ec3..f7f41dd9f6 100644 --- a/configs/nucleo-f401re/nsh/defconfig +++ b/configs/nucleo-f401re/nsh/defconfig @@ -609,7 +609,6 @@ CONFIG_USART2_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig index 8bd41876b9..c5bc964887 100644 --- a/configs/nucleus2g/nsh/defconfig +++ b/configs/nucleus2g/nsh/defconfig @@ -435,7 +435,6 @@ CONFIG_UART0_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/nucleus2g/usbmsc/defconfig b/configs/nucleus2g/usbmsc/defconfig index a8f4ec8569..02e4488cbe 100644 --- a/configs/nucleus2g/usbmsc/defconfig +++ b/configs/nucleus2g/usbmsc/defconfig @@ -466,7 +466,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig index 666a74aeca..25c3d69edc 100644 --- a/configs/nucleus2g/usbserial/defconfig +++ b/configs/nucleus2g/usbserial/defconfig @@ -414,7 +414,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig index 7ba5b012b5..94e6770ea0 100644 --- a/configs/olimex-lpc-h3131/nsh/defconfig +++ b/configs/olimex-lpc-h3131/nsh/defconfig @@ -465,7 +465,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig index cd5dab59d8..c54c4462fd 100644 --- a/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/configs/olimex-lpc1766stk/ftpc/defconfig @@ -582,7 +582,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig index 3b41958aa5..3f91c32e00 100644 --- a/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -521,7 +521,6 @@ CONFIG_HIDKBD_ENCODED=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig index 065770594e..4fe9972c3a 100644 --- a/configs/olimex-lpc1766stk/hidmouse/defconfig +++ b/configs/olimex-lpc1766stk/hidmouse/defconfig @@ -574,7 +574,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig index 7306784423..ae10e4626b 100644 --- a/configs/olimex-lpc1766stk/nettest/defconfig +++ b/configs/olimex-lpc1766stk/nettest/defconfig @@ -537,7 +537,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig index 4a37b5c804..509307b53f 100644 --- a/configs/olimex-lpc1766stk/nsh/defconfig +++ b/configs/olimex-lpc1766stk/nsh/defconfig @@ -583,7 +583,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig index fe81566af6..d5a6cd6fcd 100644 --- a/configs/olimex-lpc1766stk/nx/defconfig +++ b/configs/olimex-lpc1766stk/nx/defconfig @@ -584,7 +584,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig index 34554bb7c4..2f23158b60 100644 --- a/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -525,7 +525,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig index 154cbc0a1c..c90d1f82c0 100644 --- a/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/configs/olimex-lpc1766stk/thttpd/defconfig @@ -542,7 +542,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig index 91959fc0e7..ac5ff57f1b 100644 --- a/configs/olimex-lpc1766stk/usbmsc/defconfig +++ b/configs/olimex-lpc1766stk/usbmsc/defconfig @@ -530,7 +530,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig index 7d1651cb5d..ed2f40035d 100644 --- a/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/configs/olimex-lpc1766stk/usbserial/defconfig @@ -517,7 +517,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig index 0b85fcda9a..89775daa37 100644 --- a/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/configs/olimex-lpc1766stk/zmodem/defconfig @@ -597,7 +597,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig index 2ff8f9b72e..a76584fd3a 100644 --- a/configs/olimex-lpc2378/nsh/defconfig +++ b/configs/olimex-lpc2378/nsh/defconfig @@ -400,7 +400,6 @@ CONFIG_UART2_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-stm32-h405/nshusb/defconfig b/configs/olimex-stm32-h405/nshusb/defconfig index 8d94a78d96..94c5f6cadb 100644 --- a/configs/olimex-stm32-h405/nshusb/defconfig +++ b/configs/olimex-stm32-h405/nshusb/defconfig @@ -651,7 +651,6 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index 79c448f822..09f7e0f4a8 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -567,7 +567,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig index 498db41e48..4acf410715 100644 --- a/configs/olimex-stm32-p207/nsh/defconfig +++ b/configs/olimex-stm32-p207/nsh/defconfig @@ -605,7 +605,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig index fadf32af9e..73fdd1e1ad 100644 --- a/configs/olimex-strp711/nettest/defconfig +++ b/configs/olimex-strp711/nettest/defconfig @@ -463,7 +463,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig index 768f64f280..4dc3d2a9c2 100644 --- a/configs/olimex-strp711/nsh/defconfig +++ b/configs/olimex-strp711/nsh/defconfig @@ -420,7 +420,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig index ab3c82e734..5380be081d 100644 --- a/configs/open1788/knsh/defconfig +++ b/configs/open1788/knsh/defconfig @@ -535,7 +535,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -CONFIG_MM_MULTIHEAP=y CONFIG_MM_KERNEL_HEAP=y CONFIG_MM_KERNEL_HEAPSIZE=8192 # CONFIG_MM_SMALL is not set diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig index 0a0b857ff5..f0b2ca3d7c 100644 --- a/configs/open1788/nsh/defconfig +++ b/configs/open1788/nsh/defconfig @@ -403,7 +403,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig index ab0cd87ae4..37bfb55716 100644 --- a/configs/open1788/nxlines/defconfig +++ b/configs/open1788/nxlines/defconfig @@ -494,7 +494,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig index 3242ecb6a3..30ef6a9ef8 100644 --- a/configs/pcblogic-pic32mx/nsh/defconfig +++ b/configs/pcblogic-pic32mx/nsh/defconfig @@ -442,7 +442,6 @@ CONFIG_UART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig index ec990d6d8b..8da8b0f393 100644 --- a/configs/pcduino-a10/nsh/defconfig +++ b/configs/pcduino-a10/nsh/defconfig @@ -524,7 +524,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig index b28db7ceed..94a9b8f877 100644 --- a/configs/pic32-starterkit/nsh/defconfig +++ b/configs/pic32-starterkit/nsh/defconfig @@ -545,7 +545,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig index 773d246f92..110487e4b6 100644 --- a/configs/pic32-starterkit/nsh2/defconfig +++ b/configs/pic32-starterkit/nsh2/defconfig @@ -622,7 +622,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/syslog" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig index c274b4bd1e..ce7cb623a6 100644 --- a/configs/pic32mx7mmb/nsh/defconfig +++ b/configs/pic32mx7mmb/nsh/defconfig @@ -673,7 +673,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig index 8248223de4..4c68e47e7c 100644 --- a/configs/pirelli_dpl10/nsh_highram/defconfig +++ b/configs/pirelli_dpl10/nsh_highram/defconfig @@ -316,7 +316,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig index e181aaa49c..68a3a68eaf 100644 --- a/configs/pjrc-8051/defconfig +++ b/configs/pjrc-8051/defconfig @@ -304,7 +304,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/px4fmu-v2_upstream/nsh/defconfig b/configs/px4fmu-v2_upstream/nsh/defconfig index fdec5225a2..e1ab653065 100644 --- a/configs/px4fmu-v2_upstream/nsh/defconfig +++ b/configs/px4fmu-v2_upstream/nsh/defconfig @@ -785,7 +785,6 @@ CONFIG_FS_BINFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig index 37b34307fb..df6a7f9e83 100644 --- a/configs/qemu-i486/nsh/defconfig +++ b/configs/qemu-i486/nsh/defconfig @@ -351,7 +351,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig index 8141d521c1..df124fc968 100644 --- a/configs/qemu-i486/ostest/defconfig +++ b/configs/qemu-i486/ostest/defconfig @@ -328,7 +328,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig index 219f8dae0f..4c89d04281 100644 --- a/configs/rgmp/arm/default/defconfig +++ b/configs/rgmp/arm/default/defconfig @@ -373,7 +373,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig index 0bfd9a054f..f80eadd9b3 100644 --- a/configs/rgmp/arm/nsh/defconfig +++ b/configs/rgmp/arm/nsh/defconfig @@ -395,7 +395,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig index 03709df6f7..a19ac1cb93 100644 --- a/configs/rgmp/x86/cxxtest/defconfig +++ b/configs/rgmp/x86/cxxtest/defconfig @@ -402,7 +402,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig index 7225a8de3f..a415e2ef5b 100644 --- a/configs/rgmp/x86/default/defconfig +++ b/configs/rgmp/x86/default/defconfig @@ -381,7 +381,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig index e5b8de3440..9fea420abc 100644 --- a/configs/rgmp/x86/helloxx/defconfig +++ b/configs/rgmp/x86/helloxx/defconfig @@ -402,7 +402,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig index 52a97401d2..f0957aec98 100644 --- a/configs/rgmp/x86/nsh/defconfig +++ b/configs/rgmp/x86/nsh/defconfig @@ -403,7 +403,6 @@ CONFIG_IOB_THROTTLE=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig index 03d507358a..f4886d005a 100644 --- a/configs/sam3u-ek/knsh/defconfig +++ b/configs/sam3u-ek/knsh/defconfig @@ -541,7 +541,6 @@ CONFIG_FS_FAT=y # # Memory Management # -CONFIG_MM_MULTIHEAP=y CONFIG_MM_KERNEL_HEAP=y CONFIG_MM_KERNEL_HEAPSIZE=8192 # CONFIG_MM_SMALL is not set diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig index 3495699d9e..15aa77b77d 100644 --- a/configs/sam3u-ek/nsh/defconfig +++ b/configs/sam3u-ek/nsh/defconfig @@ -475,7 +475,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig index b74b26ac89..0fd791bd5c 100644 --- a/configs/sam3u-ek/nx/defconfig +++ b/configs/sam3u-ek/nx/defconfig @@ -553,7 +553,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig index 166996f8db..6f25a8a44e 100644 --- a/configs/sam3u-ek/nxwm/defconfig +++ b/configs/sam3u-ek/nxwm/defconfig @@ -603,7 +603,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index 0a62217fe9..c81ef97ee0 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -725,7 +725,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index ccc96fbeda..d9c00b3e18 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -864,7 +864,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig index 9124332159..69ce638d4e 100644 --- a/configs/sam4e-ek/usbnsh/defconfig +++ b/configs/sam4e-ek/usbnsh/defconfig @@ -769,7 +769,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig index c98430c74f..0c7492f27e 100644 --- a/configs/sam4l-xplained/nsh/defconfig +++ b/configs/sam4l-xplained/nsh/defconfig @@ -495,7 +495,6 @@ CONFIG_USART0_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig index e5d682612e..e886761a89 100644 --- a/configs/sam4s-xplained-pro/nsh/defconfig +++ b/configs/sam4s-xplained-pro/nsh/defconfig @@ -660,7 +660,6 @@ CONFIG_FS_PROCFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig index 5279f3b77d..0b2af45b7c 100644 --- a/configs/sam4s-xplained/nsh/defconfig +++ b/configs/sam4s-xplained/nsh/defconfig @@ -469,7 +469,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig index edea1a2963..f4d19e479a 100644 --- a/configs/sama5d3-xplained/nsh/defconfig +++ b/configs/sama5d3-xplained/nsh/defconfig @@ -544,7 +544,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig index d140b53af8..9cd853efe9 100644 --- a/configs/sama5d3x-ek/demo/defconfig +++ b/configs/sama5d3x-ek/demo/defconfig @@ -706,7 +706,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig index 117bbc2b9c..b125475d78 100644 --- a/configs/sama5d3x-ek/hello/defconfig +++ b/configs/sama5d3x-ek/hello/defconfig @@ -527,7 +527,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig index 9c2a486a1b..626c3385b7 100644 --- a/configs/sama5d3x-ek/norboot/defconfig +++ b/configs/sama5d3x-ek/norboot/defconfig @@ -541,7 +541,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig index fb588baf74..2f5241b3c4 100644 --- a/configs/sama5d3x-ek/nsh/defconfig +++ b/configs/sama5d3x-ek/nsh/defconfig @@ -557,7 +557,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig index cd5e7a153f..628cb5a0e0 100644 --- a/configs/sama5d3x-ek/nx/defconfig +++ b/configs/sama5d3x-ek/nx/defconfig @@ -653,7 +653,6 @@ CONFIG_NXFONT_SERIF22X28B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig index d834ba4e2c..b73d18ace5 100644 --- a/configs/sama5d3x-ek/nxplayer/defconfig +++ b/configs/sama5d3x-ek/nxplayer/defconfig @@ -645,7 +645,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig index eca71a5e9b..c55d0fab35 100644 --- a/configs/sama5d3x-ek/nxwm/defconfig +++ b/configs/sama5d3x-ek/nxwm/defconfig @@ -718,7 +718,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig index d625d4f2d1..d2f8f66417 100644 --- a/configs/sama5d3x-ek/ov2640/defconfig +++ b/configs/sama5d3x-ek/ov2640/defconfig @@ -612,7 +612,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig index e1c282381d..6ca7dc81f6 100644 --- a/configs/sama5d4-ek/at25boot/defconfig +++ b/configs/sama5d4-ek/at25boot/defconfig @@ -610,7 +610,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig index b8f29f6b60..9e453e9cc8 100644 --- a/configs/sama5d4-ek/dramboot/defconfig +++ b/configs/sama5d4-ek/dramboot/defconfig @@ -573,7 +573,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig index b877cb3cdc..7c454c731c 100644 --- a/configs/sama5d4-ek/elf/defconfig +++ b/configs/sama5d4-ek/elf/defconfig @@ -599,7 +599,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 6d3e7caf9b..c10957f268 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -929,7 +929,6 @@ CONFIG_NXFONT_SERIF22X28B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index ab2bf92313..ee3bd00feb 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -952,7 +952,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig index d92be97d3a..037ddf9ab5 100644 --- a/configs/sama5d4-ek/ramtest/defconfig +++ b/configs/sama5d4-ek/ramtest/defconfig @@ -573,7 +573,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig index 4381e918aa..3edc90f4ae 100644 --- a/configs/samd20-xplained/nsh/defconfig +++ b/configs/samd20-xplained/nsh/defconfig @@ -462,7 +462,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index a3e5001af9..c310fa2b3d 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -766,7 +766,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig index 81a77a0333..30b0aecd61 100644 --- a/configs/sim/configdata/defconfig +++ b/configs/sim/configdata/defconfig @@ -358,7 +358,6 @@ CONFIG_NXFFS_TAILTHRESHOLD=8192 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig index 99abe08a91..964ce53c65 100644 --- a/configs/sim/cxxtest/defconfig +++ b/configs/sim/cxxtest/defconfig @@ -328,7 +328,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig index bb57f331a6..4a48a44fd8 100644 --- a/configs/sim/mount/defconfig +++ b/configs/sim/mount/defconfig @@ -331,7 +331,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig index 0ac4525afd..4aa7287213 100644 --- a/configs/sim/mtdpart/defconfig +++ b/configs/sim/mtdpart/defconfig @@ -351,7 +351,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig index 39c103f5fc..d3767b340f 100755 --- a/configs/sim/nettest/defconfig +++ b/configs/sim/nettest/defconfig @@ -435,7 +435,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig index be3e6a6e4d..cfc677b050 100644 --- a/configs/sim/nsh/defconfig +++ b/configs/sim/nsh/defconfig @@ -369,7 +369,6 @@ CONFIG_FS_BINFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig index f8df100e50..94748a9696 100644 --- a/configs/sim/nsh2/defconfig +++ b/configs/sim/nsh2/defconfig @@ -362,7 +362,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 9cdc06d755..201953db46 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -387,7 +387,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig index ad662c63c9..b0b3616e74 100644 --- a/configs/sim/nx11/defconfig +++ b/configs/sim/nx11/defconfig @@ -388,7 +388,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig index c572310878..b0cfffc810 100644 --- a/configs/sim/nxffs/defconfig +++ b/configs/sim/nxffs/defconfig @@ -339,7 +339,6 @@ CONFIG_NXFFS_TAILTHRESHOLD=8192 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig index d0c9a86c23..ab5b70c655 100644 --- a/configs/sim/nxlines/defconfig +++ b/configs/sim/nxlines/defconfig @@ -387,7 +387,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig index 32cdde3239..3f5ed0331d 100644 --- a/configs/sim/nxwm/defconfig +++ b/configs/sim/nxwm/defconfig @@ -399,7 +399,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig index 3faedb8c3d..02cfd19b26 100644 --- a/configs/sim/ostest/defconfig +++ b/configs/sim/ostest/defconfig @@ -380,7 +380,6 @@ CONFIG_SERIAL=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig index 8e21bfcc9a..4892bd66e5 100644 --- a/configs/sim/pashello/defconfig +++ b/configs/sim/pashello/defconfig @@ -340,7 +340,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig index 872eeeeab4..a2d0919523 100644 --- a/configs/sim/touchscreen/defconfig +++ b/configs/sim/touchscreen/defconfig @@ -396,7 +396,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig index addcf3e601..2a707dbc8d 100644 --- a/configs/skp16c26/ostest/defconfig +++ b/configs/skp16c26/ostest/defconfig @@ -315,7 +315,6 @@ CONFIG_NX_LCDDRIVER=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig index 7d59564950..67e8b00303 100644 --- a/configs/spark/composite/defconfig +++ b/configs/spark/composite/defconfig @@ -672,7 +672,6 @@ CONFIG_FS_FATTIME=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig index 50f1793632..9f9843cf39 100644 --- a/configs/spark/nsh/defconfig +++ b/configs/spark/nsh/defconfig @@ -672,7 +672,6 @@ CONFIG_FS_FATTIME=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig index 9ca2ec8b75..4ef79674b2 100644 --- a/configs/spark/usbmsc/defconfig +++ b/configs/spark/usbmsc/defconfig @@ -636,7 +636,6 @@ CONFIG_FS_FATTIME=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig index afc208977e..3d036cbae7 100644 --- a/configs/spark/usbnsh/defconfig +++ b/configs/spark/usbnsh/defconfig @@ -625,7 +625,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig index 4ed28a60ab..902e88fd6c 100644 --- a/configs/spark/usbserial/defconfig +++ b/configs/spark/usbserial/defconfig @@ -646,7 +646,6 @@ CONFIG_FS_FATTIME=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig index e7d204b144..eada609032 100644 --- a/configs/stm3210e-eval/buttons/defconfig +++ b/configs/stm3210e-eval/buttons/defconfig @@ -561,7 +561,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index 96ae51c362..0204850a49 100644 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -674,7 +674,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig index 52330c8b24..e0bbfc37cb 100644 --- a/configs/stm3210e-eval/nsh/defconfig +++ b/configs/stm3210e-eval/nsh/defconfig @@ -636,7 +636,6 @@ CONFIG_FAT_LCNAMES=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index efbfc2033c..c26b50fe59 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -763,7 +763,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index a1ea714315..f4ba209ce4 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -689,7 +689,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig index 92e45c0135..26005afeac 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxconsole/defconfig @@ -687,7 +687,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig index 8c2b8fcbc1..3057afccf9 100644 --- a/configs/stm3210e-eval/pm/defconfig +++ b/configs/stm3210e-eval/pm/defconfig @@ -687,7 +687,6 @@ CONFIG_NXFONT_SANS28X37B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig index 5236092705..de74faab03 100644 --- a/configs/stm3210e-eval/usbmsc/defconfig +++ b/configs/stm3210e-eval/usbmsc/defconfig @@ -607,7 +607,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig index cb1da9b787..0ed98edb7a 100644 --- a/configs/stm3210e-eval/usbserial/defconfig +++ b/configs/stm3210e-eval/usbserial/defconfig @@ -589,7 +589,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig index afe852c65f..a1716d24c3 100644 --- a/configs/stm3220g-eval/dhcpd/defconfig +++ b/configs/stm3220g-eval/dhcpd/defconfig @@ -635,7 +635,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig index 4f527498c1..cfd2455098 100644 --- a/configs/stm3220g-eval/nettest/defconfig +++ b/configs/stm3220g-eval/nettest/defconfig @@ -643,7 +643,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig index 2816e28f43..477eb72734 100644 --- a/configs/stm3220g-eval/nsh/defconfig +++ b/configs/stm3220g-eval/nsh/defconfig @@ -702,7 +702,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig index 253bde8823..f38b775785 100644 --- a/configs/stm3220g-eval/nsh2/defconfig +++ b/configs/stm3220g-eval/nsh2/defconfig @@ -707,7 +707,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/syslog" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 6c0fe26e4f..c528efffe2 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -820,7 +820,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig index e6b37f3544..e724620464 100644 --- a/configs/stm3220g-eval/telnetd/defconfig +++ b/configs/stm3220g-eval/telnetd/defconfig @@ -643,7 +643,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index 0f621bf72d..53b14531c0 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/configs/stm3240g-eval/dhcpd/defconfig @@ -637,7 +637,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index 9e3d4e0a53..7a454570d6 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -697,7 +697,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig index 6dd3135164..c99267e6aa 100644 --- a/configs/stm3240g-eval/knxwm/defconfig +++ b/configs/stm3240g-eval/knxwm/defconfig @@ -808,7 +808,6 @@ CONFIG_NXSTART_DEVNO=0 # # Memory Management # -CONFIG_MM_MULTIHEAP=y CONFIG_MM_KERNEL_HEAP=y CONFIG_MM_KERNEL_HEAPSIZE=8192 # CONFIG_MM_SMALL is not set diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index 909e9c5eaf..8336385b1f 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/configs/stm3240g-eval/nettest/defconfig @@ -645,7 +645,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 0bcc6b66ea..cdfcf2cf61 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -683,7 +683,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index bd9dc7720d..31747d924f 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/configs/stm3240g-eval/nsh2/defconfig @@ -709,7 +709,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/syslog" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig index e41a471841..f61de30599 100644 --- a/configs/stm3240g-eval/nxconsole/defconfig +++ b/configs/stm3240g-eval/nxconsole/defconfig @@ -793,7 +793,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index c0ac803f75..a78e7d6860 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -815,7 +815,6 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index 6015b2a346..2a7298e9d6 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/configs/stm3240g-eval/telnetd/defconfig @@ -645,7 +645,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig index 2a7d77c493..e93f04e9c4 100644 --- a/configs/stm3240g-eval/webserver/defconfig +++ b/configs/stm3240g-eval/webserver/defconfig @@ -696,7 +696,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index 4137c7858c..65dcb255c3 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -693,7 +693,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig index 11621eebd4..f38b494558 100644 --- a/configs/stm32_tiny/nsh/defconfig +++ b/configs/stm32_tiny/nsh/defconfig @@ -461,7 +461,6 @@ CONFIG_WL_NRF24L01_RXFIFO_LEN=128 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig index 6ce953ab71..a1e226efaa 100644 --- a/configs/stm32_tiny/usbnsh/defconfig +++ b/configs/stm32_tiny/usbnsh/defconfig @@ -454,7 +454,6 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig index 663623a30b..c9f2de47b1 100644 --- a/configs/stm32f3discovery/nsh/defconfig +++ b/configs/stm32f3discovery/nsh/defconfig @@ -522,7 +522,6 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig index 315ce63251..215b0ddd73 100644 --- a/configs/stm32f3discovery/usbnsh/defconfig +++ b/configs/stm32f3discovery/usbnsh/defconfig @@ -509,7 +509,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_GRAN is not set diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig index caae2a3e57..166fd464aa 100644 --- a/configs/stm32f429i-disco/extflash/defconfig +++ b/configs/stm32f429i-disco/extflash/defconfig @@ -662,7 +662,6 @@ CONFIG_FS_PROCFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig index bf6255bd6f..500460b389 100644 --- a/configs/stm32f429i-disco/nsh/defconfig +++ b/configs/stm32f429i-disco/nsh/defconfig @@ -597,7 +597,6 @@ CONFIG_USART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig index 2d598bc14f..301c4bb734 100644 --- a/configs/stm32f429i-disco/usbmsc/defconfig +++ b/configs/stm32f429i-disco/usbmsc/defconfig @@ -620,7 +620,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig index 2824298249..bce5df4745 100644 --- a/configs/stm32f429i-disco/usbnsh/defconfig +++ b/configs/stm32f429i-disco/usbnsh/defconfig @@ -651,7 +651,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=3 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig index 020c491c54..915451009b 100644 --- a/configs/stm32f4discovery/cxxtest/defconfig +++ b/configs/stm32f4discovery/cxxtest/defconfig @@ -561,7 +561,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig index 8373b81b5d..3725f369a0 100644 --- a/configs/stm32f4discovery/elf/defconfig +++ b/configs/stm32f4discovery/elf/defconfig @@ -563,7 +563,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig index 59f682fd34..1e89438ce3 100644 --- a/configs/stm32f4discovery/kostest/defconfig +++ b/configs/stm32f4discovery/kostest/defconfig @@ -653,7 +653,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -CONFIG_MM_MULTIHEAP=y CONFIG_MM_KERNEL_HEAP=y CONFIG_MM_KERNEL_HEAPSIZE=8192 # CONFIG_MM_SMALL is not set diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig index e5783a0d52..9fd42248fc 100644 --- a/configs/stm32f4discovery/nsh/defconfig +++ b/configs/stm32f4discovery/nsh/defconfig @@ -665,7 +665,6 @@ CONFIG_USART2_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig index b441031a56..606eb6d2de 100644 --- a/configs/stm32f4discovery/nxlines/defconfig +++ b/configs/stm32f4discovery/nxlines/defconfig @@ -675,7 +675,6 @@ CONFIG_NXFONT_SANS22X29B=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig index 74c1377df7..b7ac367dda 100644 --- a/configs/stm32f4discovery/pm/defconfig +++ b/configs/stm32f4discovery/pm/defconfig @@ -579,7 +579,6 @@ CONFIG_USART2_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig index a85536a235..98f2419451 100644 --- a/configs/stm32f4discovery/posix_spawn/defconfig +++ b/configs/stm32f4discovery/posix_spawn/defconfig @@ -563,7 +563,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig index 1c1f52c185..45c9ce6dde 100644 --- a/configs/stm32f4discovery/usbnsh/defconfig +++ b/configs/stm32f4discovery/usbnsh/defconfig @@ -620,7 +620,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig index 3db4e70ae9..7c486b6faf 100644 --- a/configs/stm32ldiscovery/nsh/defconfig +++ b/configs/stm32ldiscovery/nsh/defconfig @@ -451,7 +451,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set CONFIG_MM_SMALL=y CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig index ba0e282603..81a37a4237 100644 --- a/configs/sure-pic32mx/nsh/defconfig +++ b/configs/sure-pic32mx/nsh/defconfig @@ -444,7 +444,6 @@ CONFIG_UART2_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig index 325d01cd06..06263a3af6 100644 --- a/configs/sure-pic32mx/usbnsh/defconfig +++ b/configs/sure-pic32mx/usbnsh/defconfig @@ -491,7 +491,6 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig index c95bbfb7e4..6a124728e4 100644 --- a/configs/teensy/hello/defconfig +++ b/configs/teensy/hello/defconfig @@ -322,7 +322,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig index 3697860ee1..d436140093 100644 --- a/configs/teensy/nsh/defconfig +++ b/configs/teensy/nsh/defconfig @@ -331,7 +331,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/teensy/usbmsc/defconfig b/configs/teensy/usbmsc/defconfig index a9b0657ae9..4e3f47d19e 100644 --- a/configs/teensy/usbmsc/defconfig +++ b/configs/teensy/usbmsc/defconfig @@ -380,7 +380,6 @@ CONFIG_FS_WRITABLE=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig index 3b152234b5..2ffe56e8d2 100644 --- a/configs/tm4c123g-launchpad/nsh/defconfig +++ b/configs/tm4c123g-launchpad/nsh/defconfig @@ -425,7 +425,6 @@ CONFIG_UART0_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig index 036f01bc64..3018bb4cf7 100644 --- a/configs/twr-k60n512/nsh/defconfig +++ b/configs/twr-k60n512/nsh/defconfig @@ -378,7 +378,6 @@ CONFIG_FS_FAT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig index a1eef3aaae..245ded66b8 100644 --- a/configs/ubw32/nsh/defconfig +++ b/configs/ubw32/nsh/defconfig @@ -502,7 +502,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig index 1d384d3691..1790a4ccfd 100644 --- a/configs/us7032evb1/nsh/defconfig +++ b/configs/us7032evb1/nsh/defconfig @@ -334,7 +334,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig index 19c711653e..045089b1cd 100644 --- a/configs/us7032evb1/ostest/defconfig +++ b/configs/us7032evb1/ostest/defconfig @@ -332,7 +332,6 @@ CONFIG_DISABLE_MOUNTPOINT=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig index 1b040cc368..f12ea6144b 100644 --- a/configs/viewtool-stm32f107/highpri/defconfig +++ b/configs/viewtool-stm32f107/highpri/defconfig @@ -549,7 +549,6 @@ CONFIG_USART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig index f85dbbda95..5bbd918d1c 100644 --- a/configs/viewtool-stm32f107/netnsh/defconfig +++ b/configs/viewtool-stm32f107/netnsh/defconfig @@ -770,7 +770,6 @@ CONFIG_NET_ETHERNET=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig index c4d262e9c6..82bc316cd6 100644 --- a/configs/viewtool-stm32f107/nsh/defconfig +++ b/configs/viewtool-stm32f107/nsh/defconfig @@ -615,7 +615,6 @@ CONFIG_USART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig index 8431e29724..8c5147265f 100644 --- a/configs/vsn/nsh/defconfig +++ b/configs/vsn/nsh/defconfig @@ -622,7 +622,6 @@ CONFIG_FS_BINFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig index cb1c82abf2..7973fd9284 100644 --- a/configs/z16f2800100zcog/nsh/defconfig +++ b/configs/z16f2800100zcog/nsh/defconfig @@ -412,7 +412,6 @@ CONFIG_UART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig index 9c8aa05c84..38044ebe99 100644 --- a/configs/z16f2800100zcog/ostest/defconfig +++ b/configs/z16f2800100zcog/ostest/defconfig @@ -347,7 +347,6 @@ CONFIG_UART1_2STOP=0 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 CONFIG_ARCH_HAVE_HEAP2=y diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig index 3243c71eeb..f3a9a8da2f 100644 --- a/configs/zkit-arm-1769/hello/defconfig +++ b/configs/zkit-arm-1769/hello/defconfig @@ -542,7 +542,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig index e0dca70954..054ccf5796 100644 --- a/configs/zkit-arm-1769/nsh/defconfig +++ b/configs/zkit-arm-1769/nsh/defconfig @@ -582,7 +582,6 @@ CONFIG_FAT_MAXFNAME=32 # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index 30e9d918dc..006426137b 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -678,7 +678,6 @@ CONFIG_NXFONT_SANS23X27=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig index 7a8bc853d9..d4c721f32d 100644 --- a/configs/zkit-arm-1769/thttpd/defconfig +++ b/configs/zkit-arm-1769/thttpd/defconfig @@ -542,7 +542,6 @@ CONFIG_FS_ROMFS=y # # Memory Management # -# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h index bea2d03ba5..50aa802075 100644 --- a/include/nuttx/kmalloc.h +++ b/include/nuttx/kmalloc.h @@ -116,7 +116,7 @@ extern "C" /* This family of allocators is used to manage kernel protected memory */ -#if !defined(CONFIG_BUILD_PROTECTED) +#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_MM_KERNEL_HEAP) /* If this is not a kernel build, then these map to the same interfaces * as were used for the user-mode function. */ diff --git a/include/nuttx/mm.h b/include/nuttx/mm.h index 50ad068f94..09ea1756a2 100644 --- a/include/nuttx/mm.h +++ b/include/nuttx/mm.h @@ -230,7 +230,12 @@ extern "C" /* This is the user heap */ EXTERN struct mm_heap_s g_mmheap; +#endif +#ifdef CONFIG_MM_KERNEL_HEAP +/* This is the kernel heap */ + +EXTERN struct mm_heap_s g_kmmheap; #endif /**************************************************************************** @@ -272,47 +277,50 @@ void umm_givesemaphore(void); /* Functions contained in mm_malloc.c ***************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size); -#endif /* Functions contained in mm_free.c *****************************************/ -#ifdef CONFIG_MM_MULTIHEAP void mm_free(FAR struct mm_heap_s *heap, FAR void *mem); -#endif /* Functions contained in mm_realloc.c **************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, size_t size); -#endif /* Functions contained in mm_calloc.c ***************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size); + +/* Functions contained in kmm_calloc.c **************************************/ + +#ifdef CONFIG_MM_KERNEL_HEAP +FAR void *kmm_calloc(size_t n, size_t elem_size); #endif /* Functions contained in mm_zalloc.c ***************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size); -#endif /* Functions contained in mm_memalign.c *************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, size_t size); -#endif /* Functions contained in mm_mallinfo.c *************************************/ -#ifdef CONFIG_MM_MULTIHEAP -int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info); +struct mallinfo; /* Forward reference */ +int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info); + +/* Functions contained in kmm_mallinfo.c ************************************/ + +#ifdef CONFIG_MM_KERNEL_HEAP +#ifdef CONFIG_CAN_PASS_STRUCTS +struct mallinfo kmm_mallinfo(void); +#else +int kmm_mallinfo(struct mallinfo *info); #endif +#endif /* CONFIG_CAN_PASS_STRUCTS */ /* Functions contained in mm_shrinkchunk.c **********************************/ diff --git a/mm/Kconfig b/mm/Kconfig index 006b8cf528..fd01ad5cef 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -3,22 +3,10 @@ # see misc/tools/kconfig-language.txt. # -config MM_MULTIHEAP - bool "Build support for multiple heaps" - default n - ---help--- - Build interfaces to support multiple heaps. This should not be - confused with memory regions. One heap may be composed of multiple, - non-contiguous memory regions. The fact that the heap is composed - of such multiple regions is invisible to the end-user (other than - the heap comes pre-fragmented). Multiple heaps, on the other hand, - supports a separate set of allocators that operate on a separate set - of memory regions. - config MM_KERNEL_HEAP bool "Support a protected, kernel heap" default y - depends on (BUILD_PROTECTED && MM_MULTIHEAP) || BUILD_KERNEL + depends on BUILD_PROTECTED || BUILD_KERNEL ---help--- Partition heap memory into two parts: (1) a protected, kernel-mode heap accessible only by the NuttX kernel, and (2) an unprotected @@ -62,9 +50,6 @@ config MM_SMALL only 4-byte alignment. This may be important on some platforms where 64-bit data is in allocated structures and 8-byte alignment is required. - NOTE: If MM_MULTIHEAP is selected, then this selection applies to all - heaps. - config MM_REGIONS int "Number of memory regions" default 1 @@ -74,9 +59,6 @@ config MM_REGIONS that the memory manager must handle and enables the API mm_addregion(heap, start, end); - NOTE: If MM_MULTIHEAP is selected, then this maximum number of regions - applies to all heaps. - config ARCH_HAVE_HEAP2 bool default n diff --git a/mm/Makefile b/mm/Makefile index 349ced9f84..ef57255b01 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -51,23 +51,23 @@ endif # Core allocator logic ASRCS = -CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c -CSRCS += mm_shrinkchunk.c mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c -CSRCS += mm_memalign.c mm_free.c mm_mallinfo.c +CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c +CSRCS += mm_shrinkchunk.c +CSRCS += mm_calloc.c mm_free.c mm_mallinfo.c mm_malloc.c mm_memalign.c +CSRCS += mm_realloc.c mm_zalloc.c -# Allocator instances +# User allocator CSRCS += mm_user.c -ifeq ($(CONFIG_BUILD_PROTECTED),y) +CSRCS += umm_calloc.c umm_free.c umm_mallinfo.c umm_malloc.c +CSRCS += umm_memalign.c umm_realloc.c umm_zalloc.c + +# Kernel allocator + ifeq ($(CONFIG_MM_KERNEL_HEAP),y) CSRCS += mm_kernel.c -endif -else -ifeq ($(CONFIG_BUILD_KERNEL),y) -ifeq ($(CONFIG_MM_KERNEL_HEAP),y) -CSRCS += mm_kernel.c -endif -endif +CSRCS += kmm_calloc.c kmm_free.c kmm_mallinfo.c kmm_malloc.c +CSRCS += kmm_memalign.c kmm_realloc.c kmm_zalloc.c endif # An optional granule allocator diff --git a/mm/kmm_calloc.c b/mm/kmm_calloc.c new file mode 100644 index 0000000000..db8ac185fc --- /dev/null +++ b/mm/kmm_calloc.c @@ -0,0 +1,67 @@ +/**************************************************************************** + * mm/kmm_calloc.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: kmm_calloc + * + * Description: + * kmm_calloc is a thin wrapper for mm_calloc() + * + ****************************************************************************/ + +FAR void *kmm_calloc(size_t n, size_t elem_size) +{ + return mm_calloc(&g_kmmheap, n, elem_size); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_free.c b/mm/kmm_free.c new file mode 100644 index 0000000000..e118d78538 --- /dev/null +++ b/mm/kmm_free.c @@ -0,0 +1,82 @@ +/**************************************************************************** + * mm/kmm_free.c + * + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: kfree + * + * Description: + * Returns a chunk of kernel memory to the list of free nodes, merging + * with adjacent free chunks if possible. + * + * Parameters: + * None + * + * Return Value: + * None + * + ************************************************************************/ + +void kfree(FAR void *mem) +{ + DEBUGASSERT(kmm_heapmember(mem)); + mm_free(&g_kmmheap, mem); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_mallinfo.c b/mm/kmm_mallinfo.c new file mode 100644 index 0000000000..d7c3ab4750 --- /dev/null +++ b/mm/kmm_mallinfo.c @@ -0,0 +1,90 @@ +/**************************************************************************** + * mm/kmm_mallinfo.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: kmm_mallinfo + * + * Description: + * kmm_mallinfo returns a copy of updated current heap information for the + * kernel heap + * + ****************************************************************************/ + +#ifdef CONFIG_CAN_PASS_STRUCTS + +struct mallinfo kmm_mallinfo(void) +{ + struct mallinfo info; + mm_mallinfo(&g_kmmheap, &info); + return info; +} + +#else + +int kmm_mallinfo(struct mallinfo *info) +{ + return mm_mallinfo(&g_kmmheap, info); +} + +#endif /* CONFIG_CAN_PASS_STRUCTS */ +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_malloc.c b/mm/kmm_malloc.c new file mode 100644 index 0000000000..3646d3baea --- /dev/null +++ b/mm/kmm_malloc.c @@ -0,0 +1,89 @@ +/**************************************************************************** + * mm/kmm_malloc.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: kmalloc + * + * Description: + * Allocate memory from the kernel heap. + * + * Parameters: + * size - Size (in bytes) of the memory region to be allocated. + * + * Return Value: + * The address of the allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *kmalloc(size_t size) +{ + return mm_malloc(&g_kmmheap, size); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_memalign.c b/mm/kmm_memalign.c new file mode 100644 index 0000000000..b7fc3d5997 --- /dev/null +++ b/mm/kmm_memalign.c @@ -0,0 +1,80 @@ +/**************************************************************************** + * mm/kmm_memalign.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: kmemalign + * + * Description: + * Allocate aligned memory in the kernel heap. + * + * Parameters: + * alignment - Log2 byte alignment + * size - Size (in bytes) of the new memory region to be allocated. + * + * Return Value: + * The address of the re-allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *kmemalign(size_t alignment, size_t size) +{ + return mm_memalign(&g_kmmheap, alignment, size); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_realloc.c b/mm/kmm_realloc.c new file mode 100644 index 0000000000..cd3d383b4a --- /dev/null +++ b/mm/kmm_realloc.c @@ -0,0 +1,78 @@ +/**************************************************************************** + * mm/kmm_realloc.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: krealloc + * + * Description: + * Re-allocate memory in the kernel heap. + * + * Parameters: + * oldmem - The old memory allocated + * newsize - Size (in bytes) of the new memory region to be re-allocated. + * + * Return Value: + * The address of the re-allocated memory (NULL on failure to re-allocate) + * + ****************************************************************************/ + +FAR void *krealloc(FAR void *oldmem, size_t newsize) +{ + return mm_realloc(&g_kmmheap, oldmem, newsize); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_zalloc.c b/mm/kmm_zalloc.c new file mode 100644 index 0000000000..db14972ee6 --- /dev/null +++ b/mm/kmm_zalloc.c @@ -0,0 +1,73 @@ +/**************************************************************************** + * mm/kmm_zalloc.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#ifdef CONFIG_MM_KERNEL_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: kzalloc + * + * Description: + * Allocate and zero memory from the kernel heap. + * + * Parameters: + * size - Size (in bytes) of the memory region to be allocated. + * + * Return Value: + * The address of the allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *kzalloc(size_t size) +{ + return mm_zalloc(&g_kmmheap, size); +} + +#endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/mm_calloc.c b/mm/mm_calloc.c index 90276dd6ac..c78ede8d4e 100644 --- a/mm/mm_calloc.c +++ b/mm/mm_calloc.c @@ -39,8 +39,6 @@ #include -#include - #include /**************************************************************************** @@ -48,18 +46,17 @@ ****************************************************************************/ /**************************************************************************** - * Global Functions + * Public Functions ****************************************************************************/ /**************************************************************************** * Name: mm_calloc * - * Descripton: - * calloc calculates the size of the allocation and calls zalloc + * Descriptor: + * mm_calloc() calculates the size of the allocation and calls mm_zalloc() * ****************************************************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size) { FAR void *ret = NULL; @@ -71,30 +68,3 @@ FAR void *mm_calloc(FAR struct mm_heap_s *heap, size_t n, size_t elem_size) return ret; } -#endif - -/**************************************************************************** - * Name: calloc - * - * Descripton: - * calloc calculates the size of the allocation and calls zalloc - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -FAR void *calloc(size_t n, size_t elem_size) -{ -#ifdef CONFIG_MM_MULTIHEAP - return mm_calloc(&g_mmheap, n, elem_size); -#else - FAR void *ret = NULL; - - if (n > 0 && elem_size > 0) - { - ret = zalloc(n * elem_size); - } - - return ret; -#endif -} -#endif diff --git a/mm/mm_free.c b/mm/mm_free.c index a75564b35a..bcc04abc9c 100644 --- a/mm/mm_free.c +++ b/mm/mm_free.c @@ -39,7 +39,6 @@ #include -#include #include #include @@ -53,6 +52,10 @@ * Private Functions ****************************************************************************/ +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Name: mm_free * @@ -62,9 +65,6 @@ * ****************************************************************************/ -#ifndef CONFIG_MM_MULTIHEAP -static inline -#endif void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) { FAR struct mm_freenode_s *node; @@ -153,23 +153,3 @@ void mm_free(FAR struct mm_heap_s *heap, FAR void *mem) mm_addfreechunk(heap, node); mm_givesemaphore(heap); } - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: free - * - * Description: - * Returns a chunk of memory to the list of free nodes, merging with - * adjacent free chunks if possible. - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -void free(FAR void *mem) -{ - mm_free(&g_mmheap, mem); -} -#endif diff --git a/mm/mm_kernel.c b/mm/mm_kernel.c index fcb7f13807..5435b9316d 100644 --- a/mm/mm_kernel.c +++ b/mm/mm_kernel.c @@ -111,104 +111,6 @@ void kmm_addregion(FAR void *heap_start, size_t heap_size) return mm_addregion(&g_kmmheap, heap_start, heap_size); } -/************************************************************************ - * Name: kmalloc - * - * Description: - * Allocate memory from the kernel heap. - * - * Parameters: - * size - Size (in bytes) of the memory region to be allocated. - * - * Return Value: - * The address of the allocated memory (NULL on failure to allocate) - * - ************************************************************************/ - -FAR void *kmalloc(size_t size) -{ - return mm_malloc(&g_kmmheap, size); -} - -/************************************************************************ - * Name: kzalloc - * - * Description: - * Allocate and zero memory from the kernel heap. - * - * Parameters: - * size - Size (in bytes) of the memory region to be allocated. - * - * Return Value: - * The address of the allocated memory (NULL on failure to allocate) - * - ************************************************************************/ - -FAR void *kzalloc(size_t size) -{ - return mm_zalloc(&g_kmmheap, size); -} - -/************************************************************************ - * Name: krealloc - * - * Description: - * Re-allocate memory in the kernel heap. - * - * Parameters: - * oldmem - The old memory allocated - * newsize - Size (in bytes) of the new memory region to be re-allocated. - * - * Return Value: - * The address of the re-allocated memory (NULL on failure to re-allocate) - * - ************************************************************************/ - -FAR void *krealloc(FAR void *oldmem, size_t newsize) -{ - return mm_realloc(&g_kmmheap, oldmem, newsize); -} - -/************************************************************************ - * Name: kmemalign - * - * Description: - * Allocate aligned memory in the kernel heap. - * - * Parameters: - * alignment - Log2 byte alignment - * size - Size (in bytes) of the new memory region to be allocated. - * - * Return Value: - * The address of the re-allocated memory (NULL on failure to allocate) - * - ************************************************************************/ - -FAR void *kmemalign(size_t alignment, size_t size) -{ - return mm_memalign(&g_kmmheap, alignment, size); -} - -/************************************************************************ - * Name: kfree - * - * Description: - * Return allocated memory to the kernel heap. - * - * Parameters: - * None - * - * Return Value: - * None - * - ************************************************************************/ - -void kfree(FAR void *mem) -{ - DEBUGASSERT(kmm_heapmember(mem)); - return mm_free(&g_kmmheap, mem); -} - /************************************************************************ * Name: kmm_trysemaphore * diff --git a/mm/mm_mallinfo.c b/mm/mm_mallinfo.c index e89408f362..6f00a8f035 100644 --- a/mm/mm_mallinfo.c +++ b/mm/mm_mallinfo.c @@ -57,6 +57,10 @@ * Private Functions ****************************************************************************/ +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Name: mm_mallinfo * @@ -65,9 +69,6 @@ * ****************************************************************************/ -#ifndef CONFIG_MM_MULTIHEAP -static inline -#endif int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) { struct mm_allocnode_s *node; @@ -137,37 +138,3 @@ int mm_mallinfo(FAR struct mm_heap_s *heap, FAR struct mallinfo *info) info->fordblks = fordblks; return OK; } - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: kmallinfo and mallinfo - * - * Description: - * mallinfo returns a copy of updated current heap information for either - * the user heap (mallinfo) or the kernel heap (kmallinfo). - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -# ifdef CONFIG_CAN_PASS_STRUCTS - -struct mallinfo mallinfo(void) -{ - struct mallinfo info; - - mm_mallinfo(&g_mmheap, &info); - return info; -} - -# else - -int mallinfo(struct mallinfo *info) -{ - return mm_mallinfo(&g_mmheap, info); -} - -#endif -#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/mm_malloc.c b/mm/mm_malloc.c index 2566e15110..47237f99f9 100644 --- a/mm/mm_malloc.c +++ b/mm/mm_malloc.c @@ -39,7 +39,6 @@ #include -#include #include #include @@ -69,6 +68,10 @@ * Private Functions ****************************************************************************/ +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Name: mm_malloc * @@ -80,9 +83,6 @@ * ****************************************************************************/ -#ifndef CONFIG_MM_MULTIHEAP -static inline -#endif FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size) { FAR struct mm_freenode_s *node; @@ -212,26 +212,3 @@ FAR void *mm_malloc(FAR struct mm_heap_s *heap, size_t size) return ret; } - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: malloc - * - * Description: - * Find the smallest chunk that satisfies the request. Take the memory from - * that chunk, save the remaining, smaller chunk (if any). - * - * 8-byte alignment of the allocated data is assured. - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -FAR void *malloc(size_t size) -{ - return mm_malloc(&g_mmheap, size); -} -#endif - diff --git a/mm/mm_memalign.c b/mm/mm_memalign.c index 6846350b49..a45d7ffe40 100644 --- a/mm/mm_memalign.c +++ b/mm/mm_memalign.c @@ -39,7 +39,6 @@ #include -#include #include #include @@ -47,21 +46,15 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* If multiple heaps are used, then the heap must be passed as a parameter to - * mm_malloc(). In the single heap case, mm_malloc() is not available and - * we have to use malloc() (which, internally, will use the same heap). - */ - -#ifdef CONFIG_MM_MULTIHEAP -# define MM_MALLOC(h,s) mm_malloc(h,s) -#else -# define MM_MALLOC(h,s) malloc(s) -#endif /**************************************************************************** * Private Functions ****************************************************************************/ +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Name: mm_memalign * @@ -75,9 +68,6 @@ * ****************************************************************************/ -#ifndef CONFIG_MM_MULTIHEAP -static inline -#endif FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, size_t size) { @@ -87,13 +77,13 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, size_t mask = (size_t)(alignment - 1); size_t allocsize; - /* If this requested alignement less than or equal to the natural alignment + /* If this requested alinement's less than or equal to the natural alignment * of malloc, then just let malloc do the work. */ if (alignment <= MM_MIN_CHUNK) { - return MM_MALLOC(heap, size); + return mm_malloc(heap, size); } /* Adjust the size to account for (1) the size of the allocated node, (2) @@ -113,7 +103,7 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, /* Then malloc that size */ - rawchunk = (size_t)MM_MALLOC(heap, allocsize); + rawchunk = (size_t)mm_malloc(heap, allocsize); if (rawchunk == 0) { return NULL; @@ -222,27 +212,3 @@ FAR void *mm_memalign(FAR struct mm_heap_s *heap, size_t alignment, mm_givesemaphore(heap); return (FAR void*)alignedchunk; } - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: memalign - * - * Description: - * memalign requests more than enough space from malloc, finds a region - * within that chunk that meets the alignment request and then frees any - * leading or trailing space. - * - * The alignment argument must be a power of two (not checked). 8-byte - * alignment is guaranteed by normal malloc calls. - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -FAR void *memalign(size_t alignment, size_t size) -{ - return mm_memalign(&g_mmheap, alignment, size); -} -#endif diff --git a/mm/mm_realloc.c b/mm/mm_realloc.c index 658ea1df1d..c85e127666 100644 --- a/mm/mm_realloc.c +++ b/mm/mm_realloc.c @@ -49,24 +49,15 @@ /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ -/* If multiple heaps are used, then the heap must be passed as a parameter to - * mm_malloc() and mm_free(). In the single heap case, mm_malloc() and - * mm_free() are not available and we have to use malloc() and free() (which, - * internally, will use the same heap). - */ - -#ifdef CONFIG_MM_MULTIHEAP -# define MM_MALLOC(h,s) mm_malloc(h,s) -# define MM_FREE(h,m) mm_free(h,m) -#else -# define MM_MALLOC(h,s) malloc(s) -# define MM_FREE(h,m) free(m) -#endif /**************************************************************************** * Private Functions ****************************************************************************/ +/**************************************************************************** + * Public Functions + ****************************************************************************/ + /**************************************************************************** * Name: mm_realloc * @@ -90,9 +81,6 @@ * ****************************************************************************/ -#ifndef CONFIG_MM_MULTIHEAP -static inline -#endif FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, size_t size) { @@ -108,14 +96,14 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, if (!oldmem) { - return MM_MALLOC(heap, size); + return mm_malloc(heap, size); } /* If size is zero, then realloc is equivalent to free */ if (size <= 0) { - MM_FREE(heap, oldmem); + mm_free(heap, oldmem); return NULL; } @@ -361,47 +349,13 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem, */ mm_givesemaphore(heap); - newmem = (FAR void*)MM_MALLOC(heap, size); + newmem = (FAR void*)mm_malloc(heap, size); if (newmem) { memcpy(newmem, oldmem, oldsize); - MM_FREE(heap, oldmem); + mm_free(heap, oldmem); } return newmem; } } - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: realloc - * - * Description: - * If the reallocation is for less space, then: - * - * (1) the current allocation is reduced in size - * (2) the remainder at the end of the allocation is returned to the - * free list. - * - * If the request is for more space and the current allocation can be - * extended, it will be extended by: - * - * (1) Taking the additional space from the following free chunk, or - * (2) Taking the additional space from the preceding free chunk. - * (3) Or both - * - * If the request is for more space but the current chunk cannot be - * extended, then malloc a new buffer, copy the data into the new buffer, - * and free the old buffer. - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -FAR void *realloc(FAR void *oldmem, size_t size) -{ - return mm_realloc(&g_mmheap, oldmem, size); -} -#endif diff --git a/mm/mm_zalloc.c b/mm/mm_zalloc.c index 805fab82dc..c665adc04b 100644 --- a/mm/mm_zalloc.c +++ b/mm/mm_zalloc.c @@ -39,7 +39,6 @@ #include -#include #include #include @@ -60,7 +59,6 @@ * ****************************************************************************/ -#ifdef CONFIG_MM_MULTIHEAP FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size) { FAR void *alloc = mm_malloc(heap, size); @@ -71,29 +69,3 @@ FAR void *mm_zalloc(FAR struct mm_heap_s *heap, size_t size) return alloc; } -#endif - -/**************************************************************************** - * Name: zalloc - * - * Description: - * zalloc calls malloc, then zeroes out the allocated chunk. - * - ****************************************************************************/ - -#ifdef CONFIG_MM_USER_HEAP -FAR void *zalloc(size_t size) -{ -#ifdef CONFIG_MM_MULTIHEAP - return mm_zalloc(&g_mmheap, size); -#else - FAR void *alloc = malloc(size); - if (alloc) - { - memset(alloc, 0, size); - } - - return alloc; -#endif -} -#endif diff --git a/mm/umm_calloc.c b/mm/umm_calloc.c new file mode 100644 index 0000000000..fd3ac60f27 --- /dev/null +++ b/mm/umm_calloc.c @@ -0,0 +1,69 @@ +/**************************************************************************** + * mm/umm_calloc.c + * + * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: calloc + * + * Description: + * calloc is a thin wrapper for mm_calloc() + * + ****************************************************************************/ + +FAR void *calloc(size_t n, size_t elem_size) +{ + return mm_calloc(&g_mmheap, n, elem_size); +} + +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_free.c b/mm/umm_free.c new file mode 100644 index 0000000000..366bf45602 --- /dev/null +++ b/mm/umm_free.c @@ -0,0 +1,74 @@ +/**************************************************************************** + * mm/umm_free.c + * + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: free + * + * Description: + * Returns a chunk of user memory to the list of free nodes, merging with + * adjacent free chunks if possible. + * + ****************************************************************************/ + +void free(FAR void *mem) +{ + mm_free(&g_mmheap, mem); +} + +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_mallinfo.c b/mm/umm_mallinfo.c new file mode 100644 index 0000000000..9ef03aec71 --- /dev/null +++ b/mm/umm_mallinfo.c @@ -0,0 +1,90 @@ +/**************************************************************************** + * mm/umm_mallinfo.c + * + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: mallinfo + * + * Description: + * mallinfo returns a copy of updated current heap information for the + * user heap. + * + ****************************************************************************/ + +#ifdef CONFIG_CAN_PASS_STRUCTS + +struct mallinfo mallinfo(void) +{ + struct mallinfo info; + mm_mallinfo(&g_mmheap, &info); + return info; +} + +#else + +int mallinfo(struct mallinfo *info) +{ + return mm_mallinfo(&g_mmheap, info); +} + +#endif /* CONFIG_CAN_PASS_STRUCTS */ +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_malloc.c b/mm/umm_malloc.c new file mode 100644 index 0000000000..6d08fbc29e --- /dev/null +++ b/mm/umm_malloc.c @@ -0,0 +1,91 @@ +/**************************************************************************** + * mm/umm_malloc.c + * + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: malloc + * + * Description: + * Allocate memory from the user heap. + * + * Parameters: + * size - Size (in bytes) of the memory region to be allocated. + * + * Return Value: + * The address of the allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *malloc(size_t size) +{ + return mm_malloc(&g_mmheap, size); +} + +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_memalign.c b/mm/umm_memalign.c new file mode 100644 index 0000000000..429b81f890 --- /dev/null +++ b/mm/umm_memalign.c @@ -0,0 +1,78 @@ +/**************************************************************************** + * mm/umm_memalign.c + * + * Copyright (C) 2007, 2009, 2011, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: memalign + * + * Description: + * memalign requests more than enough space from malloc, finds a region + * within that chunk that meets the alignment request and then frees any + * leading or trailing space. + * + * The alignment argument must be a power of two (not checked). 8-byte + * alignment is guaranteed by normal malloc calls. + * + ****************************************************************************/ + +FAR void *memalign(size_t alignment, size_t size) +{ + return mm_memalign(&g_mmheap, alignment, size); +} + +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_realloc.c b/mm/umm_realloc.c new file mode 100644 index 0000000000..4f5391938d --- /dev/null +++ b/mm/umm_realloc.c @@ -0,0 +1,80 @@ +/**************************************************************************** + * mm/mm_realloc.c + * + * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: krealloc + * + * Description: + * Re-allocate memory in the user heap. + * + * Parameters: + * oldmem - The old memory allocated + * newsize - Size (in bytes) of the new memory region to be re-allocated. + * + * Return Value: + * The address of the re-allocated memory (NULL on failure to re-allocate) + * + ****************************************************************************/ + +FAR void *realloc(FAR void *oldmem, size_t size) +{ + return mm_realloc(&g_mmheap, oldmem, size); +} + +#endif /* CONFIG_MM_USER_HEAP */ diff --git a/mm/umm_zalloc.c b/mm/umm_zalloc.c new file mode 100644 index 0000000000..84da8c37b0 --- /dev/null +++ b/mm/umm_zalloc.c @@ -0,0 +1,75 @@ +/**************************************************************************** + * mm/mm_zalloc.c + * + * Copyright (C) 2007, 2009, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#ifdef CONFIG_MM_USER_HEAP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/************************************************************************ + * Name: kzalloc + * + * Description: + * Allocate and zero memory from the user heap. + * + * Parameters: + * size - Size (in bytes) of the memory region to be allocated. + * + * Return Value: + * The address of the allocated memory (NULL on failure to allocate) + * + ************************************************************************/ + +FAR void *zalloc(size_t size) +{ + return mm_zalloc(&g_mmheap, size); +} + +#endif /* CONFIG_MM_USER_HEAP */