Fix SDBlockDevice compile error, fix "no rule to make mbed-target-con…

…fig.h"
mbed-ce · Jan 11, 2024 · c452370 · c452370
1 parent 4e13dfa
commit c452370
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -285,7 +285,7 @@ if(NOT MBED_IS_NATIVE_BUILD)
     mbed_create_distro(mbed-os ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources mbed-rtos-flags mbed-rtos-sources)
 
     # Set up the linker script and hook it up to the top-level OS targets
-    mbed_setup_linker_script(mbed-baremetal mbed-os ${CMAKE_CURRENT_BINARY_DIR}/mbed-target-config.h)
+    mbed_setup_linker_script(mbed-baremetal mbed-os ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h)
 
     # Make sure that things linking mbed-core-flags can also get the target-specific include dirs and flags.
     mbed_extract_flags(${MBED_TARGET_CMAKE_NAME}-flags ${MBED_TARGET_CMAKE_NAME})

diff --git a/storage/blockdevice/COMPONENT_SD/source/SDBlockDevice.cpp b/storage/blockdevice/COMPONENT_SD/source/SDBlockDevice.cpp
@@ -441,11 +441,13 @@ int SDBlockDevice::init()
     return BD_ERROR_OK;
 }
 
+#if DEVICE_SPI_ASYNCH
 void SDBlockDevice::set_async_spi_mode(bool enabled, DMAUsage dma_usage_hint)
 {
     _async_spi_enabled = enabled;
     _spi.set_dma_usage(dma_usage_hint);
 }
+#endif
 
 int SDBlockDevice::deinit()
 {

diff --git a/targets/targets.json5 b/targets/targets.json5
@@ -7205,6 +7205,8 @@
         ],
         "macros_add": [
             "CONFIG_GPIO_AS_PINRESET",
+
+            // Make room for the bootloader
             "MBED_APP_START=0x10000",
             "MBED_APP_SIZE=0xf0000"
         ],
@@ -7216,20 +7218,19 @@
     },
     "ARDUINO_NANO33BLE_SWD": {
         "inherits": [
-            "MCU_NRF52840"
-        ],
-        "features_add": [
-            "STORAGE"
+            "ARDUINO_NANO33BLE"
         ],
-        "components_remove": [
-            "QSPIF"
-        ],
-        "device_has_remove": [
-            "QSPI",
-            "ITM"
-        ],
-        "macros_add": [
-            "CONFIG_GPIO_AS_PINRESET"
+
+        // for SWD we default to UART console
+        "overrides": {
+            "console-usb": false,
+            "console-uart": true
+        },
+
+        // For SWD we don't want to leave space for the bootloader
+        "macros_remove": [
+            "MBED_APP_START=0x10000",
+            "MBED_APP_SIZE=0xf0000"
         ]
     },
     "NUMAKER_PFM_NUC472": {