Merge pull request #13430 from LDong-Arm/refactor_frameworks

Relocated libraries in features/frameworks

.codecheckignore

@@ -22,6 +22,8 @@
 ^platform/cxxsupport
 ^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
 ^platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
+^platform/mbed-trace
+^platform/randlib
 ^platform/tests/UNITTESTS
 ^events/tests/UNITTESTS
 ^rtos/source/TARGET_CORTEX/rtx4
@@ -31,4 +33,4 @@
 ^UNITTESTS
 ^storage/blockdevice/tests/UNITTESTS
 ^storage/kvstore/tests/UNITTESTS
-^drivers/tests/UNITTESTS
+^drivers/tests/UNITTESTS

UNITTESTS/CMakeLists.txt

@@ -114,6 +114,7 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../features"
   "${PROJECT_SOURCE_DIR}/../platform/include"
   "${PROJECT_SOURCE_DIR}/../platform/include/platform"
+  "${PROJECT_SOURCE_DIR}/../platform/mbed-trace/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
   "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
   "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
@@ -132,7 +133,6 @@ set(unittest-includes-base
   "${PROJECT_SOURCE_DIR}/../events/source"
   "${PROJECT_SOURCE_DIR}/../rtos/include"
   "${PROJECT_SOURCE_DIR}/../features/frameworks"
-  "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
   "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
   "${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"

UNITTESTS/empty_baseline/unittest.cmake

@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ..
   ../connectivity/mbedtls/include/mbedtls/
   ../connectivity/mbedtls/platform/inc/
-  ../features/frameworks/mbed-trace/mbed-trace/
+  ../platform/mbed-trace/include/mbed-trace/
 )
 
 set(unittest-test-sources

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellulardevice/unittest.cmake

@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
   ../connectivity/cellular/include/cellular/framework/device
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
   ../drivers
   ../hal
 )

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularinformation/unittest.cmake

@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 )
 
 # Source files

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularnetwork/unittest.cmake

@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 )
 
 # Source files

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularsms/unittest.cmake

@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 )
 
 # Source files

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/unittest.cmake

@@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 )
 
 # Source files

connectivity/cellular/tests/UNITTESTS/framework/common/util/unittest.cmake

@@ -7,7 +7,7 @@
 set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 )
 
 # Source files

connectivity/cellular/tests/UNITTESTS/framework/device/athandler/unittest.cmake

@@ -9,7 +9,7 @@ set(unittest-includes ${unittest-includes}
   ../connectivity/cellular/tests/UNITTESTS/framework/common/util
   ../connectivity/cellular/include/cellular/framework/common
   ../connectivity/cellular/include/cellular/framework/AT
-  ../features/frameworks/mbed-client-randlib/mbed-client-randlib
+  ../platform/randlib/include/mbed-client-randlib
 
 )
 

connectivity/drivers/cellular/COMPONENT_STMOD_CELLULAR/README.md

@@ -13,7 +13,7 @@ The STMOD+ Connector specification can be found [here](https://www.st.com/conten
 
 ## Debug print
 
-mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/features/frameworks/mbed-trace/README.md
+mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/platform/mbed-trace/README.md
 
 Enable it in your mbed_app.json file:
 

drivers/source/SFDP.cpp

@@ -26,8 +26,14 @@
 
 #if (DEVICE_SPI || DEVICE_QSPI)
 
-#include "features/frameworks/mbed-trace/mbed-trace/mbed_trace.h"
+#if MBED_CONF_MBED_TRACE_ENABLE
+#include "mbed-trace/mbed_trace.h"
 #define TRACE_GROUP "SFDP"
+#else // MBED_CONF_MBED_TRACE_ENABLE
+#define tr_info(...)
+#define tr_error(...)
+#define tr_debug(...)
+#endif // MBED_CONF_MBED_TRACE_ENABLE
 
 namespace {
 

features/frameworks/mbed-trace/CMakeLists.txt → platform/mbed-trace/CMakeLists.txt

@@ -15,4 +15,3 @@ set (MBED_TRACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/source/mbed_trace.c)
 
 
 CREATE_LIBRARY(mbedTrace "${MBED_TRACE_SRC}" "")
-

features/frameworks/mbed-trace/Jenkinsfile → platform/mbed-trace/Jenkinsfile

@@ -82,7 +82,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
             execute("mbed --version")
             execute("echo https://github.com/armmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9 > mbed-os.lib")
             execute("mbed deploy")
-            execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
+            execute("rm -rf ./mbed-os/platform/mbed-trace")
             execute("mbed compile -m ${target} -t ${toolchain} --library")
             setBuildStatus('SUCCESS', "build ${buildName}", "build done")
           } catch (err) {
@@ -102,7 +102,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
               execute("echo \"https://github.com/ARMmbed/mbed-trace#${env.GIT_COMMIT_HASH}\" > mbed-trace.lib")
               execute("mbed new .")
               execute("mbed deploy")
-              execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
+              execute("rm -rf ./mbed-os/platform/mbed-trace")
               execute("rm -rf ./mbed-trace/example")
               execute("rm -rf ./mbed-trace/test")
               execute("mbed compile -t ${toolchain} -m ${target}")

platform/randlib/.mbedignore

@@ -0,0 +1,2 @@
+linux/*
+tests/unit/*

platform/randlib/.yotta_ignore

@@ -0,0 +1 @@
+tests/unit/*

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/Makefile → platform/randlib/tests/unit/Makefile

@@ -5,11 +5,11 @@ clean:
 else
 DIRS := $(filter-out ./, $(sort $(dir $(shell find . -name 'Makefile'))))
 
-all:	
+all:
 	for dir in $(DIRS); do \
 		cd $$dir; make gcov; cd ..;\
 	done
-	
+
 clean:
 	for dir in $(DIRS); do \
 		cd $$dir; make clean; cd ..;\

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/MakefileWorker.mk → platform/randlib/tests/unit/MakefileWorker.mk

@@ -261,7 +261,7 @@ ifeq ($(CPPUTEST_USE_MEM_LEAK_DETECTION), N)
 	CPPUTEST_CPPFLAGS += -DCPPUTEST_MEM_LEAK_DETECTION_DISABLED
 else
     ifndef CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE
-	    	CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorNewMacros.h
+		CPPUTEST_MEMLEAK_DETECTOR_NEW_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorNewMacros.h
     endif
     ifndef CPPUTEST_MEMLEAK_DETECTOR_MALLOC_MACRO_FILE
 	    CPPUTEST_MEMLEAK_DETECTOR_MALLOC_MACRO_FILE = -include $(CPPUTEST_HOME)/include/CppUTest/MemoryLeakDetectorMallocMacros.h
@@ -270,7 +270,7 @@ endif
 
 ifeq ($(CPPUTEST_ENABLE_DEBUG), Y)
 	CPPUTEST_CXXFLAGS += -g
-	CPPUTEST_CFLAGS += -g 
+	CPPUTEST_CFLAGS += -g
 	CPPUTEST_LDFLAGS += -g
 endif
 

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/Makefile → platform/randlib/tests/unit/randlib/Makefile

@@ -15,4 +15,3 @@ TEST_SRC_FILES = \
 include ../MakefileWorker.mk
 
 CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT -DRANDLIB_PRNG
-

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/main.cpp → platform/randlib/tests/unit/randlib/main.cpp

@@ -12,4 +12,3 @@ int main(int ac, char **av)
 }
 
 IMPORT_TEST_GROUP(randLIB);
-

features/frameworks/mbed-client-randlib/test/mbed-client-randlib/unittest/randlib/test_randlib.h → platform/randlib/tests/unit/randlib/test_randlib.h

@@ -32,4 +32,3 @@ bool test_randLIB_randomise_base();
 #endif
 
 #endif // TEST_RANDLIB_H
-

storage/kvstore/source/FileSystemStore.cpp

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mbed_trace.h"
+#include "mbed-trace/mbed_trace.h"
 #define TRACE_GROUP "FSST"
 
 #define FSST_REVISION 1

storage/kvstore/tests/UNITTESTS/FileSystemStore/unittest.cmake

@@ -5,7 +5,7 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/frameworks/mbed-trace/mbed-trace
+  ../platform/mbed-trace/mbed-trace
 )
 
 set(unittest-sources
@@ -15,7 +15,7 @@ set(unittest-sources
   ../storage/filesystem/source/Dir.cpp
   ../storage/filesystem/source/File.cpp
   ../storage/filesystem/source/FileSystem.cpp
-  ../features/frameworks/mbed-trace/source/mbed_trace.c
+  ../platform/mbed-trace/source/mbed_trace.c
   ../storage/filesystem/littlefs/littlefs/lfs_util.c
   ../storage/filesystem/littlefs/littlefs/lfs.c
   ../platform/source/FileBase.cpp

storage/kvstore/tests/UNITTESTS/TDBStore/unittest.cmake

@@ -6,15 +6,15 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/frameworks/mbed-trace/mbed-trace
+  ../platform/mbed-trace/mbed-trace
 )
 
 set(unittest-sources
   ../storage/blockdevice/source/FlashSimBlockDevice.cpp
   ../storage/blockdevice/source/HeapBlockDevice.cpp
   ../storage/blockdevice/source/BufferedBlockDevice.cpp
   ../storage/kvstore/source/TDBStore.cpp
-  ../features/frameworks/mbed-trace/source/mbed_trace.c
+  ../platform/mbed-trace/source/mbed_trace.c
   stubs/mbed_atomic_stub.c
   stubs/mbed_assert_stub.cpp
   stubs/mbed_error.c