Use Pydantic schemas to validate Mbed's JSON files (part 1)

.github/workflows/greentea_cmake.yml

@@ -133,8 +133,8 @@ jobs:
           apt-get update
           apt-get install -y python3-venv
 
+      # Always build with baremetal profile, as it should work with every target
       - name: Build ${{ matrix.target }} with baremetal profile
-        if: ${{ matrix.profile == 'baremetal' }}
         # Note: We have to set a wifi network name and password so that the test will compile on devices that use wifi
         run: |
             rm -rf __build

TESTS/configs/greentea_baremetal.json5

@@ -1,11 +1,9 @@
 {
-    "target_overrides": {
-        "*": {
-            "target.c_lib": "small",
-            "target.application-profile": "bare-metal"
-        }
-    },
     "overrides": {
+        "target.c_lib": "small",
+
+        "target.application-profile": "bare-metal",
+
         // Enable Mbed Stats tests
         "platform.all-stats-enabled": 1,
 

cmsis/device/rtos/mbed_lib.json

@@ -1,11 +1,10 @@
 {
     "name": "rtos",
     "config": {
-      "rtos": {
-         "help": "Select RTOS  (RTX or N/A)",
-         "value": "RTX"
-      },
-        "present": 1,
+        "rtos": {
+           "help": "Select RTOS  (RTX or N/A)",
+           "value": "RTX"
+         },
          "main-thread-stack-size": {
             "help": "The size of the main thread's stack",
             "value": 4096

connectivity/FEATURE_BLE/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "ble",
-    "requires": ["ble-api-implementation"],
     "config": {
         "present": 1,
         "ble-role-observer": {

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/driver/CMakeLists.txt

@@ -1,9 +1,18 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if("BlueNRG_2" IN_LIST MBED_TARGET_LABELS OR "BlueNRG_MS" IN_LIST MBED_TARGET_LABELS)
+    if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+        set(TEST_SKIPPED "BlueNRG bluetooth modules require an RTOS!")
+    endif()
+endif()
+
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-connectivity-ble-cordio-hci-driver
+    TEST_SKIPPED
+        ${TEST_SKIPPED}
     TEST_SOURCES
         main.cpp
     TEST_REQUIRED_LIBS

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt

@@ -5,6 +5,12 @@ if("CORDIO_ZERO_COPY_HCI" IN_LIST MBED_CONFIG_DEFINITIONS OR "CORDIO_ZERO_COPY_H
     set(TEST_SKIPPED "Test not relevant for zero copy hci.")
 endif()
 
+if("BlueNRG_2" IN_LIST MBED_TARGET_LABELS OR "BlueNRG_MS" IN_LIST MBED_TARGET_LABELS)
+    if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+        set(TEST_SKIPPED "BlueNRG bluetooth modules require an RTOS!")
+    endif()
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-connectivity-ble-cordio-hci-transport

connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp

@@ -317,7 +317,7 @@ ble::SecurityManager &BLEInstanceBase::getSecurityManager()
 
 const ble::SecurityManager &BLEInstanceBase::getSecurityManager() const
 {
-    const BLEInstanceBase &self = const_cast<BLEInstanceBase &>(*this);
+    BLEInstanceBase &self = const_cast<BLEInstanceBase &>(*this);
     return const_cast<const ble::SecurityManager &>(self.getSecurityManager());
 }
 #endif // BLE_FEATURE_SECURITY

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt

@@ -1,6 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+# This driver needs the RTOS
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+    return()
+endif()
+
 add_library(mbed-bluenrg2 STATIC EXCLUDE_FROM_ALL
     BlueNrg2HCIDriver.cpp)
 

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt

@@ -1,6 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+# This driver needs the RTOS
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+	return()
+endif()
+
 add_library(mbed-bluenrg-ms STATIC EXCLUDE_FROM_ALL
 	BlueNrgMsHCIDriver.cpp)
 

connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/mbed_lib.json

@@ -1,4 +1,3 @@
 {
-    "name": "cordio-stm32wb",
-    "requires": ["cordio", "ble"]
+    "name": "cordio-stm32wb"
 }

connectivity/drivers/emac/CMakeLists.txt

@@ -5,6 +5,12 @@ if(NOT "DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
     return()
 endif()
 
+# EMAC needs the RTOS
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+    return()
+endif()
+
+
 add_library(mbed-emac STATIC EXCLUDE_FROM_ALL
     sources/CompositeEMAC.cpp
     sources/GenericEthPhy.cpp

connectivity/drivers/lora/COMPONENT_SX126X/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "SX126X-lora-driver",
-    "requires": ["lora"],
     "config": {
         "spi-frequency": {
         	"help": "SPI frequency, Default: 16 MHz",

connectivity/drivers/lora/COMPONENT_SX1272/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "sx1272-lora-driver",
-    "requires": ["lora"],
     "config": {
         "spi-frequency": {
         	"help": "SPI frequency, Default: 8 MHz",

connectivity/drivers/lora/COMPONENT_SX1276/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "sx1276-lora-driver",
-    "requires": ["lora"],
     "config": {
         "spi-frequency": {
         	"help": "SPI frequency, Default: 8 MHz",

connectivity/drivers/lora/TARGET_STM32WL/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "stm32wl-lora-driver",
-    "requires": ["lora"],
     "config": {
         "buffer-size": {
             "help": "Max. buffer size the radio can handle, Default: 255 B",

connectivity/drivers/wifi/COMPONENT_ESPRESSIF_ESP8266/mbed_lib.json

@@ -31,7 +31,7 @@
         },
         "power-on-polarity": {
             "help": "Polarity of power-on for the modem. 0 means 0/1 for power on/off; 1 means 1/0 for power on/off.",
-            "options": [0, 1],
+            "accepted_values": [0, 1],
             "value": 0
         },
         "power-on-time-ms": {

connectivity/lorawan/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "lora",
-    "requires": ["mbedtls", "events"],
     "config": {
         "phy": {
             "help": "LoRa PHY region: EU868, AS923, AU915, CN470, CN779, EU433, IN865, KR920, US915",

connectivity/lwipstack/CMakeLists.txt

@@ -1,6 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+# LwIP needs the RTOS
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+    return()
+endif()
+
 add_library(mbed-lwipstack STATIC EXCLUDE_FROM_ALL)
 
 target_include_directories(mbed-lwipstack

connectivity/lwipstack/mbed_lib.json5

@@ -1,7 +1,6 @@
 {
     "name": "lwip",
     "config": {
-        "present": 1,
         "ipv4-enabled": {
             "help": "Enable IPv4",
             "value": true

connectivity/nanostack/mbed-mesh-api/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "mbed-mesh-api",
-    "requires": ["nanostack"],
     "config": {
         "heap-size": {
             "help": "Nanostack's heap size [bytes: 0-4294967295]",

connectivity/nanostack/mbed_lib.json

@@ -1,4 +1,3 @@
 {
-    "name": "nanostack-interface",
-    "requires": ["nanostack"]
+    "name": "nanostack-interface"
 }

connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt

@@ -1,6 +1,11 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+# This lib needs the RTOS
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+    return()
+endif()
+
 add_library(mbed-nanostack-hal_mbed_cmsis_rtos STATIC EXCLUDE_FROM_ALL)
 
 target_include_directories(mbed-nanostack-hal_mbed_cmsis_rtos

connectivity/nanostack/sal-stack-nanostack-eventloop/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "nanostack-eventloop",
-    "requires": ["nanostack-hal"],
     "config": {
         "use_platform_tick_timer": {
             "help": "Use platform provided low resolution tick timer for eventloop",

connectivity/nanostack/sal-stack-nanostack/mbed_lib.json

@@ -1,6 +1,5 @@
 {
     "name": "nanostack",
-    "requires": ["nanostack-eventloop", "coap-service"],
     "config": {
         "configuration": {
             "help": "Build time configuration. Refer to Handbook for valid values. Default: full stack",

connectivity/netsocket/mbed_lib.json5

@@ -1,7 +1,6 @@
 {
     "name": "nsapi",
     "config": {
-        "present": 1,
         "add-event-listener-return-change": {
             "help": "Updates the add_event_listener to return a nsapi_error_t value which can indicate allocation failure. See documents for more details.",
             "value": 0

connectivity/netsocket/tests/TESTS/network/emac/CMakeLists.txt

@@ -20,6 +20,10 @@ list(
             emac_test_unicast_long.cpp
 )
 
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+	set(TEST_SKIPPED "This test requires an RTOS!")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-connectivity-network-emac

connectivity/netsocket/tests/TESTS/network/wifi/CMakeLists.txt

@@ -9,6 +9,10 @@ if(NOT "MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=WIFI" IN_LIST MBED_CONFI
 	set(TEST_SKIPPED "Requires wi-fi to be the default network interface")
 endif()
 
+if(APPLICATION_PROFILE_CONFIG_BAREMETAL)
+	set(TEST_SKIPPED "This test requires an RTOS!")
+endif()
+
 # Options specific to this test
 set(MBED_GREENTEA_WIFI_MAX_SCAN_SIZE 30 CACHE STRING "How many networks may appear in Wifi scan result")
 set(MBED_GREENTEA_WIFI_SECURE_CHANNEL 1 CACHE STRING "Channel number that the wifi network is on.  Used for channel-specific connection tests, if supported by the wifi driver.")

events/mbed_lib.json

@@ -1,7 +1,6 @@
 {
     "name": "events",
     "config": {
-        "present": 1,
         "shared-stacksize": {
             "help": "Stack size (bytes) for shared event queue thread",
             "value": 2048

features/frameworks/cy_rtos_rtx_adapter/mbed_lib.json

@@ -1,6 +1,3 @@
 {
-    "name": "cy_psoc6csp_rtos",
-    "config": {
-          "present": 1
-    }
+    "name": "cy_psoc6csp_rtos"
 }

platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV/mbed_lib.json

@@ -1,12 +1,3 @@
 {
-    "name": "psa-services",
-    "requires": [
-        "drivers",
-        "platform",
-        "mbedtls",
-        "storage",
-        "flashiap-block-device",
-        "kv-global-api",
-        "storage_tdb_internal"
-    ]
+    "name": "psa-services"
 }

platform/bare_metal/mbed_lib.json

@@ -1,4 +1,3 @@
 {
-  "name": "bare-metal",
-  "requires": ["platform", "drivers", "rtos-api", "mbed-trace", "blockdevice"]
+  "name": "bare-metal"
 }

platform/mbed-trace/mbed_lib.json

@@ -20,7 +20,7 @@
         },
         "color-theme": {
             "help": "Set color theme. 0 for readable, 1 for unobtrusive.",
-            "options": [0, 1],
+            "accepted_values": [0, 1],
             "macro_name": "MBED_TRACE_COLOR_THEME",
             "value": 0
         },

platform/tests/TESTS/mbed_platform/stats_cpu/CMakeLists.txt

@@ -11,6 +11,10 @@ if((NOT "MBED_CPU_STATS_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS) AND (NOT "MB
 	set(TEST_SKIPPED "CPU stats not enabled")
 endif()
 
+if("MBED_CONF_TARGET_APPLICATION_PROFILE=bare-metal" IN_LIST MBED_CONFIG_DEFINITIONS)
+    set(TEST_SKIPPED "This test requires the RTOS")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-platform-stats-cpu

platform/tests/TESTS/mbed_platform/stats_thread/CMakeLists.txt

@@ -7,6 +7,10 @@ if((NOT "MBED_THREAD_STATS_ENABLED=1" IN_LIST MBED_CONFIG_DEFINITIONS) AND (NOT
 	set(TEST_SKIPPED "Thread stats not enabled")
 endif()
 
+if("MBED_CONF_TARGET_APPLICATION_PROFILE=bare-metal" IN_LIST MBED_CONFIG_DEFINITIONS)
+	set(TEST_SKIPPED "This test requires the RTOS")
+endif()
+
 mbed_greentea_add_test(
     TEST_NAME
         mbed-platform-stats-thread

rtos/mbed_lib.json

@@ -1,6 +1,3 @@
 {
-  "name": "rtos-api",
-  "config": {
-        "present": 1
-  }
+  "name": "rtos-api"
 }

storage/blockdevice/COMPONENT_SPIF/mbed_lib.json

@@ -8,7 +8,7 @@
         "SPI_FREQ": "40000000",
         "debug": {
             "help": "Enable debug logs. [0/1]",
-            "options" : [0, 1],
+            "accepted_values" : [0, 1],
             "value": 0
         }
     },

storage/filesystem/mbed_lib.json

@@ -1,6 +1,3 @@
 {
-    "name": "filesystem",
-    "config": {
-        "present": 1
-    }
+    "name": "filesystem"
 }