STM32: allow HS USB endpoints and increase USB OTG_HS endpoints number

.gitignore

@@ -100,3 +100,8 @@ DELIVERY/
 
 # Directory used to clone and build TF-M
 features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/TARGET_IGNORE/
+
+# CMake
+CMakeCache.txt
+cmake_install.cmake
+CMakeFiles/

.travis.yml

@@ -21,26 +21,22 @@ dist: xenial
 
 env:
   global:
-    - deps_url="https://mbed-os-ci.s3-eu-west-1.amazonaws.com/jenkins-ci/deps"
+    - deps_url="https://mbed-os-ci-public.s3-eu-west-1.amazonaws.com/jenkins-ci/deps"
     - deps_dir="${HOME}/.cache/deps"
 
 cache:
   pip: true
+  ccache: true
   directories:
     - ${HOME}/.cache/deps
-    - ${HOME}/.ccache
-
 
 before_install:
   - source tools/test/travis-ci/functions.sh
-  - set_status "pending" "Test started."
-
-after_success:
-  - set_status "success" "Success!"
-
-after_failure:
-  - set_status "failure" "Test failed."
 
+addons:
+  apt:
+    packages:
+    - ninja-build
 
 matrix:
   include:
@@ -77,41 +73,32 @@ matrix:
               | ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
               | while read file; do cp --parents "${file}" SCANCODE; done
         - scancode -l --json-pp scancode.json SCANCODE
-        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json || true
+        - python ./tools/test/travis-ci/scancode-evaluate.py scancode.json || true
         # run the same but for new files. All new files must have SPDX
         - >-
             git diff --name-only --diff-filter=A FETCH_HEAD..HEAD \
               | ( grep '.\(c\|cpp\|h\|hpp\|py\)$' || true ) \
               | ( grep -v '^tools/test/toolchains/api_test.py' || true ) \
               | while read file; do cp --parents "${file}" SCANCODE_NEW_FILES; done
         - scancode -l --json-pp scancode_new_files.json SCANCODE_NEW_FILES
-        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode_new_files.json || true
-      after_success:
-        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode.json
+        - python ./tools/test/travis-ci/scancode-evaluate.py scancode_new_files.json || true
         - cat scancode-evaluate.log
-        - COUNT=$(cat scancode-evaluate.log | grep 'File:' | wc -l)
-        - python ./tools/test/travis-ci/scancode-evaluate.py -f scancode_new_files.json
+        - COUNT=$(cat scancode-evaluate.log | grep 'File:' | grep -v 'SPDX' | wc -l) || true
+        - python ./tools/test/travis-ci/scancode-evaluate.py scancode_new_files.json
         - cat scancode-evaluate.log
-        - COUNT_NEW_FILES=$(cat scancode-evaluate.log | grep 'File:' | wc -l)
+        - COUNT_NEW_FILES=$(cat scancode-evaluate.log | grep 'File:' | grep -v 'SPDX' | wc -l) || true
         - |
           if [ $COUNT == 0 ] && [ $COUNT_NEW_FILES == 0 ]; then
               echo "License check OK";
-              STATUSM="All licenses OK";
-              set_status "success" "$STATUSM";
+              true;
             elif [ $COUNT_NEW_FILES != 0 ]; then
-              echo "License check failed, files with the license issues found";
-              STATUSM="Needs review, license issues in modified files: ${COUNT}, new files: ${COUNT_NEW_FILES}";
-              set_status "failure" "$STATUSM";
+              echo "License check failed, new files with the license issues found";
               false;
             else
               echo "License check failed, please review license issues found in modified files";
-              STATUSM="Needs review, ${COUNT} license issues found";
-              set_status "success" "$STATUSM";
               false;
           fi
 
-
-
     - <<: *basic-vm
       name: "include check"
       env: NAME=include_check
@@ -122,15 +109,14 @@ matrix:
               ':!*tests/*' ':!*targets/*' ':!*TARGET_*' ':!*unsupported/*' \
               ':!*events/tests/*' ':!*drivers/tests/*'
 
-
     ### Docs Tests ###
     - &docs-vm
       stage: "Docs"
       name: "astyle"
       env: NAME=astyle
       install:
         - >-
-          curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
+          curl -L0 https://mbed-os-ci-public.s3-eu-west-1.amazonaws.com/jenkins-ci/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
           mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
           cd BUILD/astyle/build/gcc;
           make;
@@ -305,20 +291,6 @@ matrix:
         # Run profiling tests
         - make -C ${EVENTS}/tests/unit prof | tee prof
         - ccache -s
-      after_success:
-        # Update status, comparing with master if possible.
-        - |
-          CURR=$(grep -o '[0-9]\+ cycles' prof | awk '{sum += $1} END {print sum}')
-          PREV=$(curl -u "${MBED_BOT}" https://github.com/api/repos/${TRAVIS_REPO_SLUG}/status/master \
-              | jq -re "select(.sha != \"${TRAVIS_COMMIT}\")
-                  | .statuses[] | select(.context == \"travis-ci/${NAME}\").description
-                  | capture(\"runtime is (?<runtime>[0-9]+)\").runtime" \
-              || echo 0)
-
-          delta=""
-          [ "${PREV}" -ne 0 ] && delta="($(printf "%+d" "$(( ${CURR} - ${PREV} ))" cycles)"
-
-          set_status "success" "Success! Runtime is ${CURR} cycles. ${delta}"
 
     - <<: *extended-vm
       name: "littlefs"
@@ -379,17 +351,3 @@ matrix:
             CFLAGS+="-DLFS_NO_ASSERT -DLFS_NO_DEBUG -DLFS_NO_WARN -DLFS_NO_ERROR"
             | tee sizes
         - ccache -s
-      after_success:
-        # Update status, comparing with master if possible.
-        - |
-          CURR=$(tail -n1 sizes | awk '{print $1}')
-          PREV=$(curl -u "${MBED_BOT}" https://github.com/api/repos/${TRAVIS_REPO_SLUG}/status/master \
-              | jq -re "select(.sha != \"${TRAVIS_COMMIT}\")
-                  | .statuses[] | select(.context == \"travis-ci/${NAME}\").description
-                  | capture(\"code size is (?<size>[0-9]+)\").size" \
-              || echo 0)
-
-          delta=""
-          [ "${PREV}" -ne 0 ] && delta="($(printf "%+0.2f%%" "$(<<< "100 * ((${CURR} - ${PREV})/${PREV})" bc -l)"))"
-
-          set_status "success" "Success! Code size is ${CURR}B. ${delta}"

CMakeLists.txt

@@ -0,0 +1,249 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+# This is the boilerplate for Mbed OS
+
+cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
+
+# Using relative paths behavior
+if(POLICY CMP0076)
+    cmake_policy(SET CMP0076 NEW)
+endif()
+
+include(${MBED_CONFIG_PATH}/mbed_config.cmake)
+include(${MBED_PATH}/tools/cmake/core.cmake)
+
+add_library(mbed-core INTERFACE)
+
+add_library(mbed-os INTERFACE)
+
+target_link_libraries(mbed-os
+    INTERFACE
+        mbed-rtos
+        mbed-core
+)
+
+add_library(mbed-baremetal INTERFACE)
+
+target_link_libraries(mbed-baremetal
+    INTERFACE
+        mbed-core
+)
+
+# Validate selected C library type
+# The C library type selected has to match the library that the target can support
+if(${MBED_C_LIB} STREQUAL "small")
+    if(NOT "small" IN_LIST MBED_TARGET_SUPPORTED_C_LIBS)
+        if("std" IN_LIST MBED_TARGET_SUPPORTED_C_LIBS)
+            message(WARNING
+                "We noticed that target.c_lib is set to `${MBED_C_LIB}`."
+                " As the ${MBED_TARGET} target does not support a small C library for the ${MBED_TOOLCHAIN} toolchain,"
+                " we are using the standard C library instead."
+            )
+            set(MBED_C_LIB "std" CACHE STRING "")
+        endif() 
+    endif()
+elseif(NOT ${MBED_C_LIB} IN_LIST MBED_TARGET_SUPPORTED_C_LIBS)
+    message(FATAL_ERROR
+        "Invalid `target.c_lib` ('${MBED_C_LIB}') for '${MBED_TARGET}' target."
+        "\nPossible value(s): ${MBED_TARGET_SUPPORTED_C_LIBS}"
+    )
+endif()
+
+# Validate selected printf library
+set(MBED_PRINTF_LIB_TYPES std minimal-printf)
+if(NOT ${MBED_PRINTF_LIB} IN_LIST MBED_PRINTF_LIB_TYPES)
+    message(FATAL_ERROR
+        "Invalid printf library type '${MBED_PRINTF_LIB}'. Possible values:\n ${MBED_PRINTF_LIB_TYPES}"
+    )
+endif()
+
+mbed_set_cpu_core_definitions(mbed-core)
+if(${MBED_TOOLCHAIN_FILE_USED})
+    mbed_set_cpu_core_options(mbed-core ${MBED_TOOLCHAIN})
+    mbed_set_toolchain_options(mbed-core)
+    mbed_set_profile_options(mbed-core ${MBED_TOOLCHAIN})
+    mbed_set_c_lib(mbed-core ${MBED_C_LIB})
+    mbed_set_printf_lib(mbed-core ${MBED_PRINTF_LIB})
+endif()
+
+
+set(MBED_TARGET_LABELS
+    ${MBED_TARGET_LABELS} CACHE INTERNAL ""
+)
+
+target_compile_definitions(mbed-core
+    INTERFACE
+        ${MBED_TARGET_DEFINITIONS}
+        ${MBED_CONFIG_DEFINITIONS}
+)
+
+# Add compile definitions for backward compatibility with the toolchain
+# supported. New source files should instead check for __GNUC__ and __clang__
+# for the GCC_ARM and ARM toolchains respectively. 
+if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
+    target_compile_definitions(mbed-core
+        INTERFACE
+            TOOLCHAIN_GCC_ARM
+            TOOLCHAIN_GCC
+    )
+elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
+    target_compile_definitions(mbed-core
+        INTERFACE
+            TOOLCHAIN_ARM
+    )
+endif()
+
+# Include mbed.h and config from generate folder
+target_include_directories(mbed-core
+    INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# These targets are made visible here so their source files which
+# are spread in different directories can be referenced and can be linked against
+# by libraries that depend on them.
+# TODO CMake: Should the source files be moved?
+add_library(mbed-device_key INTERFACE)
+add_library(mbed-rtos INTERFACE)
+
+add_subdirectory(cmsis)
+add_subdirectory(drivers)
+add_subdirectory(hal)
+add_subdirectory(platform)
+add_subdirectory(rtos)
+add_subdirectory(targets)
+
+# The directories below contain optional target libraries
+add_subdirectory(events EXCLUDE_FROM_ALL)
+add_subdirectory(connectivity EXCLUDE_FROM_ALL)
+add_subdirectory(storage EXCLUDE_FROM_ALL)
+add_subdirectory(drivers/device_key EXCLUDE_FROM_ALL)
+add_subdirectory(drivers/source/usb EXCLUDE_FROM_ALL)
+add_subdirectory(features EXCLUDE_FROM_ALL)
+add_subdirectory(platform/FEATURE_EXPERIMENTAL_API EXCLUDE_FROM_ALL)
+add_subdirectory(cmsis/CMSIS_5/CMSIS/RTOS2 EXCLUDE_FROM_ALL)
+add_subdirectory(cmsis/device/rtos EXCLUDE_FROM_ALL)
+
+#
+# Configures the application
+#
+function(mbed_configure_app_target target)
+    mbed_set_language_standard(${target})
+endfunction()
+
+#
+# Specifies linker script used for linking `target`.
+#
+function(mbed_set_mbed_target_linker_script target)
+    get_property(mbed_target_linker_script GLOBAL PROPERTY MBED_TARGET_LINKER_FILE)
+    if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+        mbed_generate_gcc_options_for_linker(${target} _linker_preprocess_definitions)
+        set(CMAKE_PRE_BUILD_COMMAND
+            COMMAND "arm-none-eabi-cpp" ${_linker_preprocess_definitions} -x assembler-with-cpp -E -Wp,-P
+                ${mbed_target_linker_script} -o ${CMAKE_BINARY_DIR}/${target}.link_script.ld
+
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            BYPRODUCTS "${CMAKE_BINARY_DIR}/${target}.link_script.ld"
+        )
+    elseif(MBED_TOOLCHAIN STREQUAL "ARM")
+        set(CMAKE_PRE_BUILD_COMMAND COMMAND "")
+        target_link_options(mbed-core
+            INTERFACE
+                "--scatter=${mbed_target_linker_script}"
+        )
+    endif()
+    add_custom_command(
+        TARGET
+            ${target}
+        PRE_LINK
+            ${CMAKE_PRE_BUILD_COMMAND}
+        COMMENT
+            "Link line:"
+        VERBATIM
+    )
+endfunction()
+
+#
+# Converts output file of `target` to binary file and to Intel HEX file.
+#
+function(mbed_generate_bin_hex target)
+    get_property(elf_to_bin GLOBAL PROPERTY ELF2BIN)
+    if(MBED_TOOLCHAIN STREQUAL "GCC_ARM")
+        set(CMAKE_POST_BUILD_COMMAND
+            COMMAND ${elf_to_bin} -O binary $<TARGET_FILE:${target}> ${CMAKE_BINARY_DIR}/${target}.bin
+            COMMAND ${CMAKE_COMMAND} -E echo "-- built: ${CMAKE_BINARY_DIR}/${target}.bin"
+            COMMAND ${elf_to_bin} -O ihex $<TARGET_FILE:${target}> ${CMAKE_BINARY_DIR}/${target}.hex
+            COMMAND ${CMAKE_COMMAND} -E echo "-- built: ${CMAKE_BINARY_DIR}/${target}.hex"
+        )
+    elseif(MBED_TOOLCHAIN STREQUAL "ARM")
+        get_property(mbed_studio_arm_compiler GLOBAL PROPERTY MBED_STUDIO_ARM_COMPILER)
+        set(CMAKE_POST_BUILD_COMMAND
+            COMMAND ${elf_to_bin} ${mbed_studio_arm_compiler} --bin  -o ${CMAKE_BINARY_DIR}/${target}.bin $<TARGET_FILE:${target}>
+            COMMAND ${CMAKE_COMMAND} -E echo "-- built: ${CMAKE_BINARY_DIR}/${target}.bin"
+            COMMAND ${elf_to_bin} ${mbed_studio_arm_compiler} --i32combined  -o ${CMAKE_BINARY_DIR}/${target}.hex $<TARGET_FILE:${target}>
+            COMMAND ${CMAKE_COMMAND} -E echo "-- built: ${CMAKE_BINARY_DIR}/${target}.hex"
+        )
+    endif()
+    add_custom_command(
+        TARGET
+            ${target}
+        POST_BUILD
+            ${CMAKE_POST_BUILD_COMMAND}
+        COMMENT
+            "executable:"
+        VERBATIM
+    )
+endfunction()
+
+#
+# Parse toolchain generated map file of `target` and display a readable table format.
+#
+function(mbed_generate_map_file target)
+     find_package (Python3)
+     add_custom_command(
+         TARGET
+             ${target}
+         POST_BUILD
+         COMMAND ${Python3_EXECUTABLE} ${MBED_PATH}/tools/memap.py -t ${MBED_TOOLCHAIN} ${CMAKE_BINARY_DIR}/${target}${CMAKE_EXECUTABLE_SUFFIX}.map
+         WORKING_DIRECTORY
+             ${CMAKE_BINARY_DIR}
+         COMMENT
+             "Displaying memory map for ${target}"
+)
+endfunction()
+
+#
+# Validate selected application profile.
+#
+function(mbed_validate_application_profile target)
+    get_target_property(app_link_libraries ${target} LINK_LIBRARIES)
+    string(FIND "${app_link_libraries}" "mbed-baremetal" string_found_position)
+    if(${string_found_position} GREATER_EQUAL 0)
+        if(NOT "bare-metal" IN_LIST MBED_TARGET_SUPPORTED_APPLICATION_PROFILES)
+            message(FATAL_ERROR
+                "Use full profile as baremetal profile is not supported for this Mbed target")
+        endif()
+    elseif(NOT "full" IN_LIST MBED_TARGET_SUPPORTED_APPLICATION_PROFILES)
+        message(FATAL_ERROR
+            "The full profile is not supported for this Mbed target")
+    endif()
+endfunction()
+
+#
+# Set post build operations
+#
+function(mbed_set_post_build target)
+    mbed_validate_application_profile(${target})
+    mbed_generate_bin_hex(${target})
+    mbed_generate_map_file(${target})
+endfunction()
+
+# Ninja requires to be forced for response files
+if ("${CMAKE_GENERATOR}" MATCHES "Ninja")
+    # known issue ARMClang and Ninja with response files for windows
+    # https://gitlab.kitware.com/cmake/cmake/-/issues/21093
+    if(NOT (CMAKE_HOST_SYSTEM_NAME MATCHES "Windows" AND CMAKE_CXX_COMPILER_ID MATCHES "ARMClang"))
+        set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1 CACHE INTERNAL "")
+    endif()
+endif()