Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/thread.c

1 files changed, 0 insertions, 20 deletions

diff --git a/components/lwp/SConscript b/components/lwp/SConscript
deleted file mode 100644
index f54d9422e1..0000000000
--- a/components/lwp/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('rtconfig')
-from building import *
-
-cwd     = GetCurrentDir()
-src     = []
-CPPPATH = []
-
-support_arch  = {"arm": ["cortex-m3", "cortex-m4", "cortex-m7"]}
-platform_file = {'armcc': 'rvds.S', 'gcc': 'gcc.S', 'iar': 'iar.S'}
-
-if rtconfig.PLATFORM in platform_file.keys():	# support platforms
-    if rtconfig.ARCH in support_arch.keys() and rtconfig.CPU in support_arch[rtconfig.ARCH]:
-        # arch/arm/cortex-m7/lwp_gcc.S
-        asm_path = 'arch/' + rtconfig.ARCH + '/' + rtconfig.CPU + '/*_' + platform_file[rtconfig.PLATFORM]
-        src = Glob('*.c') + Glob(asm_path)
-        CPPPATH = [cwd]
-
-group = DefineGroup('lwP', src, depend = ['RT_USING_LWP'], CPPPATH = CPPPATH)
-
-Return('group')