mirror of
https://github.com/apache/nuttx.git
synced 2026-05-24 07:46:16 +08:00
Remove CONFIG_MM_MULTIHEAP. Non-multiheap operation is no longer supported
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user