fix: Update Kconfig for new allocator

Kconfig

@@ -255,9 +255,9 @@ menu "System Type"
 source "arch/Kconfig"
 endmenu
 
-#menu "Standard Libc Configuration"
-#source "libc/Kconfig"
-#endmenu
+menu "Standard Libc Configuration"
+source "common/Kconfig"
+endmenu
 
 menu "GP TEE Configuration"
 

arch/cortex-m33/mps2/src/mps2_an505_qemu/secure/Makefile

@@ -91,7 +91,6 @@ OBJS_S = $(AOBJS_S) $(COBJS_S)
 LIBPATHS = -L. -L"$(TOPDIR)/lib"
 
 LIBS =  -lm -lc -lnosys -lalloc_s -lcrypt_s
-#-lStdDriver_s
 
 $(AOBJS_S): $(OBJDIR)/%$(OBJEXT): %.S
 	$(Q) mkdir -p $(OBJDIR)/$(dir $<)

common/Kconfig

@@ -0,0 +1,12 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the docs folder of mTower repository.
+#
+
+comment "Heap of secure part"
+
+config TOTAL_HEAP_SIZE
+	hex "Total heap size (hex)"
+	default 0x2000
+	---help---
+		"Total heap size for secure part"

common/heap_4.c

@@ -36,21 +36,10 @@
  */
 #include <stdlib.h>
 #include <stdint.h>
-// #include "portable.h"
-// #include "portmacro.h"
-
-/* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
- * all the API functions to use the MPU wrappers.  That should only be done when
- * task.h is included from an application file. */
-// #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
-
-// #include "FreeRTOS.h"
-// #include "task.h"
-
-// #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE
+#include "config.h"
 
 #define configSUPPORT_DYNAMIC_ALLOCATION    1
-#define configTOTAL_HEAP_SIZE               8000
+#define configTOTAL_HEAP_SIZE               CONFIG_TOTAL_HEAP_SIZE
 #define configAPPLICATION_ALLOCATED_HEAP    0
 
 #define PRIVILEGED_FUNCTION

configs/m2351_badge/defconfig

@@ -48,6 +48,8 @@ CONFIG_START_ADDRESS_BL33=0x10040000
 # System Type
 #
 CONFIG_ARCH_CORTEX_M23=y
+# CONFIG_ARCH_CORTEX_M33 is not set
+# CONFIG_ARCH_RISCV_32 is not set
 CONFIG_ARCH="cortex-m23"
 CONFIG_ARCH_FAMILY_M2351=y
 CONFIG_ARCH_FAMILY="m2351"
@@ -424,10 +426,21 @@ CONFIG_REGION7_NONSECURE=y
 # CONFIG_GCC_VERSION_6_1_2017Q1 is not set
 CONFIG_GCC_VERSION_6_1_2017Q2=y
 # CONFIG_GCC_VERSION_8_2018Q4 is not set
+# CONFIG_GCC_VERSION_10_2_0_2020_12 is not set
+# CONFIG_GCC_VERSION_T_HEAD_10_2_0 is not set
 CONFIG_GCC_VERSION="arm-none-eabi-6-2017-q2-update-linux"
 CONFIG_GCC_SITE="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2"
 CONFIG_GCC_FOLDER="gcc-arm-none-eabi-6-2017-q2-update"
 
+#
+# Standard Libc Configuration
+#
+
+#
+# Heap of secure part:
+#
+CONFIG_TOTAL_HEAP_SIZE=0x2000
+
 #
 # GP TEE Configuration
 #

configs/mps2_an505_qemu/defconfig

@@ -49,6 +49,7 @@ CONFIG_START_ADDRESS_BL33=0x10040000
 #
 # CONFIG_ARCH_CORTEX_M23 is not set
 CONFIG_ARCH_CORTEX_M33=y
+# CONFIG_ARCH_RISCV_32 is not set
 CONFIG_ARCH="cortex-m33"
 CONFIG_ARCH_FAMILY="mps2"
 CONFIG_PLATFORM="mps2_an505_qemu"
@@ -91,9 +92,6 @@ CONFIG_SAU_INIT_END6=0x30017FFF
 CONFIG_SAU_INIT_REGION7=y
 CONFIG_SAU_INIT_START7=0x50000000
 CONFIG_SAU_INIT_END7=0x5FFFFFFF
-CONFIG_GCC_VERSION="arm-none-eabi-8-2018-q4-major-linux"
-CONFIG_GCC_SITE="https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4"
-CONFIG_GCC_FOLDER="gcc-arm-none-eabi-8-2018-q4-major"
 CONFIG_ARCH_FAMILY_MPS2=y
 
 #
@@ -132,7 +130,23 @@ CONFIG_PLATFORM_MPS2_AN505_QEMU=y
 #
 # Toolchain Configuration Options
 #
+# CONFIG_GCC_VERSION_6_1_2017Q1 is not set
+# CONFIG_GCC_VERSION_6_1_2017Q2 is not set
 CONFIG_GCC_VERSION_8_2018Q4=y
+# CONFIG_GCC_VERSION_10_2_0_2020_12 is not set
+# CONFIG_GCC_VERSION_T_HEAD_10_2_0 is not set
+CONFIG_GCC_VERSION="arm-none-eabi-8-2018-q4-major-linux"
+CONFIG_GCC_SITE="https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4"
+CONFIG_GCC_FOLDER="gcc-arm-none-eabi-8-2018-q4-major"
+
+#
+# Standard Libc Configuration
+#
+
+#
+# Heap of secure part:
+#
+CONFIG_TOTAL_HEAP_SIZE=0x2000
 
 #
 # GP TEE Configuration

configs/numaker_pfm_m2351/defconfig

@@ -49,6 +49,7 @@ CONFIG_START_ADDRESS_BL33=0x10040000
 #
 CONFIG_ARCH_CORTEX_M23=y
 # CONFIG_ARCH_CORTEX_M33 is not set
+# CONFIG_ARCH_RISCV_32 is not set
 CONFIG_ARCH="cortex-m23"
 CONFIG_ARCH_FAMILY_M2351=y
 CONFIG_ARCH_FAMILY="m2351"
@@ -425,10 +426,21 @@ CONFIG_REGION7_NONSECURE=y
 # CONFIG_GCC_VERSION_6_1_2017Q1 is not set
 CONFIG_GCC_VERSION_6_1_2017Q2=y
 # CONFIG_GCC_VERSION_8_2018Q4 is not set
+# CONFIG_GCC_VERSION_10_2_0_2020_12 is not set
+# CONFIG_GCC_VERSION_T_HEAD_10_2_0 is not set
 CONFIG_GCC_VERSION="arm-none-eabi-6-2017-q2-update-linux"
 CONFIG_GCC_SITE="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2"
 CONFIG_GCC_FOLDER="gcc-arm-none-eabi-6-2017-q2-update"
 
+#
+# Standard Libc Configuration
+#
+
+#
+# Heap of secure part:
+#
+CONFIG_TOTAL_HEAP_SIZE=0x2000
+
 #
 # GP TEE Configuration
 #