From b082c91d8be95603a3ddfc18e63bd5f3d2c5a517 Mon Sep 17 00:00:00 2001
From: yangjie11 <yangjiexaut@126.com>
Date: Wed, 18 Nov 2020 20:36:42 +0800
Subject: [src] add a __RTTHREAD__ global macro definition

---
 src/SConscript | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/SConscript')

diff --git a/src/SConscript b/src/SConscript
index 82c3b8aaf1..c03d997cd1 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -29,6 +29,8 @@ if GetDepend('RT_USING_DEVICE') == False:
 if GetDepend('RT_USING_SMP') == False:
     SrcRemove(src, ['cpu.c'])
 
-group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH)
+CPPDEFINES = ['__RTTHREAD__']
+
+group = DefineGroup('Kernel', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
 
 Return('group')
-- 
cgit v1.3.1


From d79802b942e77389e1f885d9fe27a62434c652f9 Mon Sep 17 00:00:00 2001
From: yangjie11 <yangjiexaut@126.com>
Date: Sat, 21 Nov 2020 17:56:02 +0800
Subject: [src][SConscript] Provide user heap options

---
 src/Kconfig    | 14 +++++++++++++-
 src/SConscript |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/SConscript')

diff --git a/src/Kconfig b/src/Kconfig
index 63a7a67887..803c827e51 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -270,6 +270,18 @@ menu "Memory Management"
         config RT_USING_MEMHEAP_AS_HEAP
             bool "Use all of memheap objects as heap"
         endif
+
+        config RT_USING_USERHEAP
+            bool "Use user heap"
+            help
+                If this option is selected, please implement these functions:
+                    rt_malloc(), rt_malloc_sethook()
+                    rt_free(),   rt_free_sethook()
+                    rt_calloc(), rt_realloc()
+                    rt_system_heap_init()
+
+                And if FinSH is used at the same time, please implement list_mem()
+
     endchoice
 
     if RT_USING_SMALL_MEM
@@ -294,7 +306,7 @@ menu "Memory Management"
         default y if RT_USING_SMALL_MEM
         default y if RT_USING_SLAB
         default y if RT_USING_MEMHEAP_AS_HEAP
-
+        default y if RT_USING_USERHEAP
 endmenu
 
 menu "Kernel Device Object"
diff --git a/src/SConscript b/src/SConscript
index c03d997cd1..806cdef2c5 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -23,6 +23,9 @@ if GetDepend('RT_USING_MEMHEAP') == False:
     if GetDepend('RT_USING_MEMHEAP_AS_HEAP'):
         SrcRemove(src, ['mem.c'])
 
+if GetDepend('RT_USING_USERHEAP'):
+   SrcRemove(src, ['mem.c', 'slab.c', 'memheap.c'])
+
 if GetDepend('RT_USING_DEVICE') == False:
     SrcRemove(src, ['device.c'])
 
-- 
cgit v1.3.1


From 077ac68661dc199946aaa37918d9bcc2db8e831e Mon Sep 17 00:00:00 2001
From: yangjie11 <yangjiexaut@126.com>
Date: Wed, 25 Nov 2020 15:45:35 +0800
Subject: [src/SConscript]update

---
 src/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SConscript')

diff --git a/src/SConscript b/src/SConscript
index 806cdef2c5..c3a7775d75 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -24,7 +24,7 @@ if GetDepend('RT_USING_MEMHEAP') == False:
         SrcRemove(src, ['mem.c'])
 
 if GetDepend('RT_USING_USERHEAP'):
-   SrcRemove(src, ['mem.c', 'slab.c', 'memheap.c'])
+    SrcRemove(src, ['mem.c', 'slab.c'])
 
 if GetDepend('RT_USING_DEVICE') == False:
     SrcRemove(src, ['device.c'])
-- 
cgit v1.3.1


From d7d663562e767c07a97e2046d45ffca84caf63cd Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Sun, 3 Jan 2021 07:23:50 +0800
Subject: [kernel] update sconscript

---
 src/SConscript | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/SConscript')

diff --git a/src/SConscript b/src/SConscript
index c3a7775d75..8dd44f5df2 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -26,6 +26,9 @@ if GetDepend('RT_USING_MEMHEAP') == False:
 if GetDepend('RT_USING_USERHEAP'):
     SrcRemove(src, ['mem.c', 'slab.c'])
 
+if GetDepend('RT_USING_SIGNALS') == False:
+    SrcRemove(src, ['signal.c'])
+
 if GetDepend('RT_USING_DEVICE') == False:
     SrcRemove(src, ['device.c'])
 
-- 
cgit v1.3.1


From 342dac48bda1c61bf848c3fac41ba545ee2ec697 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Mon, 4 Jan 2021 00:29:53 +0800
Subject: [kernel] [script] remove module.c

---
 src/SConscript | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/SConscript')

diff --git a/src/SConscript b/src/SConscript
index 8dd44f5df2..68523978d6 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -6,9 +6,6 @@ src = Glob('*.c')
 
 CPPPATH = [RTT_ROOT + '/include']
 
-if GetDepend('RT_USING_MODULE') == False:
-    SrcRemove(src, ['module.c'])
-
 if GetDepend('RT_USING_HEAP') == False or GetDepend('RT_USING_SMALL_MEM') == False:
     SrcRemove(src, ['mem.c'])
 
-- 
cgit v1.3.1