Restyle [Mbed] Add OTA-requestor-app and DFU support

.gitmodules

@@ -81,7 +81,7 @@
 	url = https://github.com/openthread/ot-efr32.git
 [submodule "third_party/mbed-os/repo"]
 	path = third_party/mbed-os/repo
-	url = https://github.com/ARMmbed/mbed-os.git
+	url = https://github.com/ATmobica/mbed-os.git
 	branch = master
 [submodule "third_party/mbed-os-posix-socket/repo"]
 	path = third_party/mbed-os-posix-socket/repo
@@ -162,3 +162,6 @@
 [submodule "p6/lwip"]
 	path = third_party/p6/p6_sdk/libs/lwip
 	url = https://github.com/lwip-tcpip/lwip.git
+[submodule "third_party/mbed-mcu-boot/repo"]
+	path = third_party/mbed-mcu-boot/repo
+	url = https://github.com/ATmobica/mcuboot.git

.vscode/launch.json

@@ -264,7 +264,7 @@
             "configFiles": ["${input:mbedTarget}.tcl"],
             "overrideLaunchCommands": [
                 "monitor reset halt",
-                "monitor program {./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests}",
+                "monitor program {./build-${input:mbedTarget}/${input:mbedFlashProfile}/chip-mbed-unit-tests.hex}",
                 "monitor reset run",
                 "quit"
             ],
@@ -315,7 +315,8 @@
                 "lighting-app",
                 "pigweed-app",
                 "all-clusters-app",
-                "shell"
+                "shell",
+                "ota-requestor-app"
             ],
             "default": "lock-app"
         },

.vscode/tasks.json

@@ -142,7 +142,8 @@
                 "-c=${input:mbedCommand}",
                 "-a=${input:mbedApp}",
                 "-b=${input:mbedTarget}",
-                "-p=${input:mbedProfile}"
+                "-p=${input:mbedProfile}",
+                "-T=${input:mbedAppType}"
             ],
             "group": "build",
             "problemMatcher": {
@@ -200,7 +201,8 @@
                 "lighting-app",
                 "pigweed-app",
                 "all-clusters-app",
-                "shell"
+                "shell",
+                "ota-requestor-app"
             ],
             "default": "lock-app"
         },
@@ -215,8 +217,15 @@
             "type": "pickString",
             "id": "mbedProfile",
             "description": "What mbed profile do you want to use?",
-            "options": ["develop", "release", "debug"],
-            "default": "develop"
+            "options": ["release", "develop", "debug"],
+            "default": "release"
+        },
+        {
+            "type": "pickString",
+            "id": "mbedAppType",
+            "description": "What mbed application type do you want to use?",
+            "options": ["simple", "boot", "upgrade"],
+            "default": "simple"
         },
         {
             "type": "promptString",

config/mbed/CMakeLists.txt

@@ -279,6 +279,10 @@ if (CONFIG_CHIP_PW_RPC)
     chip_gn_arg_bool  ("chip_build_pw_rpc_lighting_proto"     CONFIG_CHIP_PW_RPC_LIGHTING_PROTO)
     chip_gn_arg_bool  ("chip_build_pw_rpc_locking_proto"      CONFIG_CHIP_PW_RPC_LOCKING_PROTO)
 endif(CONFIG_CHIP_PW_RPC)
+if (CONFIG_CHIP_OTA_REQUESTOR)
+    chip_gn_arg_bool  ("chip_enable_ota_requestor"            CONFIG_CHIP_OTA_REQUESTOR)
+endif(CONFIG_CHIP_OTA_REQUESTOR)
+
 
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/args.gn CONTENT ${CHIP_GN_ARGS})
 
@@ -325,6 +329,12 @@ list(APPEND CHIP_INCLUDES)
 # CHIP defines
 list(APPEND CHIP_DEFINES)
 
+# Target specific configuration
+if("capsense" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(${CHIP_ROOT}/third_party/mbed-os-cypress-capsense-button/repo ${CMAKE_BINARY_DIR}/capsense_build)
+    target_link_libraries(${APP_TARGET} capsense)
+endif()
+
 list(APPEND CHIP_INCLUDES 
     ${CHIP_ROOT}/config/mbed/mbedtls
 )
@@ -442,6 +452,58 @@ endif(CONFIG_CHIP_PW_RPC_LOCKING_PROTO)
 
 endif(CONFIG_CHIP_PW_RPC)
 
+if (CONFIG_CHIP_OTA_REQUESTOR)
+    target_include_directories(${APP_TARGET} PRIVATE
+        ${CHIP_ROOT}/zzz_generated/ota-requestor-app
+        ${CHIP_ROOT}/src/app/clusters/ota-requestor
+        ${CHIP_ROOT}/src/platform/mbed
+        ${CHIP_ROOT}/src/include/platform
+    )
+
+    target_sources(${APP_TARGET} PRIVATE
+        ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
+        ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/CHIPClusters.cpp
+        ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
+
+        ${CHIP_ROOT}/src/app/clusters/ota-requestor/OTARequestor.cpp
+        ${CHIP_ROOT}/src/app/clusters/ota-requestor/BDXDownloader.cpp
+        ${CHIP_ROOT}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
+
+        ${CHIP_ROOT}/src/platform/mbed/OTAImageProcessorImpl.cpp
+    )
+
+    list(APPEND CHIP_DEFINES 
+        CHIP_OTA_REQUESTOR=1
+    )
+endif(CONFIG_CHIP_OTA_REQUESTOR)
+
+if(BOOT_ENABLED)
+    add_subdirectory(${MCUBOOT_PATH}/boot/bootutil/ ${CMAKE_BINARY_DIR}/mbed_mcu_boot_util_build)
+    add_subdirectory(${MCUBOOT_PATH}/boot/mbed/ ${CMAKE_BINARY_DIR}/mbed_mcu_boot_build)
+
+    target_include_directories(bootutil PUBLIC
+                           ${CHIP_ROOT}/config/mbed/mbedtls
+    )
+
+    target_link_libraries(${APP_TARGET} mbed-mcuboot bootutil)
+
+    file(READ ${APP_PATH}/mbed_app.json mbedAppJson)
+    string(JSON PRIMARY_SLOT_ADDRESS GET "${mbedAppJson}" target_overrides ${MBED_TARGET} mcuboot.primary-slot-address)
+    string(JSON HEADER_SIZE GET "${mbedAppJson}" target_overrides ${MBED_TARGET} mcuboot.header-size)
+    string(JSON SLOT_SIZE GET "${mbedAppJson}" target_overrides ${MBED_TARGET} mcuboot.slot-size)
+    math(EXPR APP_START "${PRIMARY_SLOT_ADDRESS} + ${HEADER_SIZE}" OUTPUT_FORMAT HEXADECIMAL)
+    math(EXPR APP_SIZE "${SLOT_SIZE} - 2 * ${HEADER_SIZE}" OUTPUT_FORMAT HEXADECIMAL)
+    target_compile_definitions(mbed-core
+        INTERFACE
+            "-DMBED_APP_START=${APP_START}"
+            "-DMBED_APP_SIZE=${APP_SIZE}"
+    )
+
+    list(APPEND CHIP_DEFINES 
+        BOOT_ENABLED=1
+    )
+endif()
+
 
 target_include_directories(${APP_TARGET} PRIVATE 
                            ${CHIP_INCLUDES}

config/mbed/chip-gn/BUILD.gn

@@ -37,6 +37,10 @@ group("mbed") {
   if (chip_build_pw_rpc_lib) {
     deps += [ "//lib/pw_rpc" ]
   }
+
+  if (chip_enable_ota_requestor) {
+    deps += [ "${chip_root}/examples/ota-requestor-app/ota-requestor-common" ]
+  }
 }
 
 group("default") {

examples/all-clusters-app/mbed/mbed_app.json

@@ -18,8 +18,7 @@
                 "MXCRYPTO_DISABLED",
                 "NL_ASSERT_LOG=NL_ASSERT_LOG_DEFAULT",
                 "NL_ASSERT_EXPECT_FLAGS=NL_ASSERT_FLAG_LOG",
-                "WHD_PRINT_DISABLE",
-                "MBED_CONF_LWIP_NETBUF_RECVINFO_ENABLED"
+                "WHD_PRINT_DISABLE"
             ]
         }
     },

examples/lighting-app/mbed/CMakeLists.txt

@@ -104,11 +104,6 @@ if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W")
     target_link_libraries(${APP_TARGET} mbed-cy-psoc6-common-network)
 endif()
 
-if("capsense" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(${CHIP_ROOT}/third_party/mbed-os-cypress-capsense-button/repo ./capsense_build)
-    target_link_libraries(${APP_TARGET} capsense)
-endif()
-
 mbed_set_post_build(${APP_TARGET})
 
 option(VERBOSE_BUILD "Have a verbose build process")

examples/lighting-app/mbed/mbed_app.json

@@ -18,8 +18,7 @@
                 "MXCRYPTO_DISABLED",
                 "NL_ASSERT_LOG=NL_ASSERT_LOG_DEFAULT",
                 "NL_ASSERT_EXPECT_FLAGS=NL_ASSERT_FLAG_LOG",
-                "WHD_PRINT_DISABLE",
-                "MBED_CONF_LWIP_NETBUF_RECVINFO_ENABLED"
+                "WHD_PRINT_DISABLE"
             ],
             "target.components_add": ["capsense"],
             "lighting-state-led": "P9_6",

examples/lock-app/mbed/CMakeLists.txt

@@ -100,11 +100,6 @@ if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W")
     target_link_libraries(${APP_TARGET} mbed-cy-psoc6-common-network)
 endif()
 
-if("capsense" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(${CHIP_ROOT}/third_party/mbed-os-cypress-capsense-button/repo ./capsense_build)
-    target_link_libraries(${APP_TARGET} capsense)
-endif()
-
 mbed_set_post_build(${APP_TARGET})
 
 option(VERBOSE_BUILD "Have a verbose build process")

examples/lock-app/mbed/mbed_app.json

@@ -18,8 +18,7 @@
                 "MXCRYPTO_DISABLED",
                 "NL_ASSERT_LOG=NL_ASSERT_LOG_DEFAULT",
                 "NL_ASSERT_EXPECT_FLAGS=NL_ASSERT_FLAG_LOG",
-                "WHD_PRINT_DISABLE",
-                "MBED_CONF_LWIP_NETBUF_RECVINFO_ENABLED"
+                "WHD_PRINT_DISABLE"
             ],
             "target.components_add": ["capsense"],
             "lock-state-led": "P9_6",

examples/ota-requestor-app/mbed/.gitignore

@@ -0,0 +1,2 @@
+build-*/
+mcuboot

examples/ota-requestor-app/mbed/CMakeLists.txt

@@ -0,0 +1,80 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.19.0)
+
+get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../.. REALPATH)
+get_filename_component(MBED_COMMON ${CHIP_ROOT}/examples/platform/mbed REALPATH)
+get_filename_component(GEN_DIR ${CHIP_ROOT}/zzz_generated/ REALPATH)
+get_filename_component(NLIO_DIR ${CHIP_ROOT}/third_party/nlio/repo/include REALPATH)
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/config.in
+    ${CMAKE_CURRENT_BINARY_DIR}/chip_build/config
+    @ONLY
+)
+
+set(MBED_PATH ${MBED_OS_PATH} CACHE INTERNAL "")
+set(MBED_CONFIG_PATH ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
+set(MCUBOOT_PATH ${MBED_MCU_BOOT_PATH} CACHE INTERNAL "")
+set(APP_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
+set(APP_TYPE ${MBED_APP_TYPE} CACHE INTERNAL "")
+set(BOOT_ENABLED FALSE)
+set(APP_TARGET chip-mbed-ota-requestor-app-example)
+
+if(APP_TYPE STREQUAL "boot" OR APP_TYPE STREQUAL "upgrade")
+    set(BOOT_ENABLED TRUE)
+endif()
+
+include(${MBED_PATH}/tools/cmake/app.cmake)
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)   
+    list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
+    list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
+endif()
+include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
+
+project(${APP_TARGET})
+
+add_subdirectory(${MBED_PATH} ./mbed_build)
+add_subdirectory(${MBED_OS_POSIX_SOCKET_PATH} ./mbed_os_posix_socket_build)
+
+add_executable(${APP_TARGET})
+
+add_subdirectory(${CHIP_ROOT}/config/mbed ./chip_build)
+
+mbed_configure_app_target(${APP_TARGET})
+
+target_include_directories(${APP_TARGET} PRIVATE
+                           ${CMAKE_CURRENT_SOURCE_DIR}
+                           ${CMAKE_CURRENT_SOURCE_DIR}/main/include/
+                           ${NLIO_DIR}
+                           ${GEN_DIR}/app-common
+                           ${MBED_COMMON}/util/include
+)
+
+target_sources(${APP_TARGET} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/main/main.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/main/AppTask.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/main/OTARequestorDriverImpl.cpp
+    ${MBED_COMMON}/util/LEDWidget.cpp
+)
+
+chip_configure_data_model(${APP_TARGET}
+    INCLUDE_SERVER
+    INCLUDE_CLIENT_CALLBACKS
+    ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+    GEN_DIR ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated
+)
+
+target_link_libraries(${APP_TARGET} mbed-os-posix-socket mbed-os mbed-ble mbed-events mbed-netsocket mbed-storage mbed-storage-kv-global-api mbed-mbedtls mbed-emac chip)
+
+if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W")
+    target_link_libraries(${APP_TARGET} mbed-cy-psoc6-common-network)
+endif()
+
+mbed_set_post_build(${APP_TARGET})
+
+option(VERBOSE_BUILD "Have a verbose build process")
+if(VERBOSE_BUILD)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()