Skip to content

Commit 456f2b2

Browse files
authored
Downgrade sd-driver (ARMmbed#127)
* Downgrade sd-driver To reduce binary size by ~1.4k * Upgrade mbed-os to 5.9.4 So that the bootloader releases with a tagged version of mbed-os. Inflates binary size by ~100bytes * Add Macro to remap mutex to all configs This config is needed because sd-driver uses Mutex which is only avaliable with rtos. Hence remapping the symbol with a global macro * Ignore wifi related file for ODIN
1 parent 3b8f84d commit 456f2b2

12 files changed

+23
-11
lines changed

.mbedignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ mbed-os/features/netsocket/*
2020
mbed-os/features/storage/*
2121
mbed-os/features/filesystem/littlefs/*
2222
mbed-os/features/filesystem/fat/*
23+
mbed-os/features/device_key/*
2324
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.c
2425
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/onboard_modem_api.h
2526
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.c
2627
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F437xG/TARGET_UBLOX_C030/min_battery_voltage.h
28+
mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/default_wifi_interface.cpp
2729
mbed-os/features/frameworks/mbed-client-randlib/*
2830
mbed-os/features/frameworks/mbed-coap/*
2931
mbed-os/features/frameworks/mbed-trace/*

configs/internal_flash_fake_rot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
10-
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
10+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
11+
"Mutex=PlatformMutex"
1112
],
1213
"config": {
1314
"application-start-address": {

configs/internal_flash_nvstore.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=1",
10-
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
10+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
11+
"Mutex=PlatformMutex"
1112
],
1213
"config": {
1314
"application-start-address": {

configs/nrf52_block_device_fake_rot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"ARM_UC_USE_PAL_CRYPTO=0",
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
11-
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE"
11+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12+
"Mutex=PlatformMutex"
1213
],
1314
"config": {
1415
"application-start-address": {

configs/nrf52_internal_flash_fake_rot.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"MAX_BOOT_RETRIES=3",
88
"ARM_UC_USE_PAL_CRYPTO=0",
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
10-
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP"
10+
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP",
11+
"Mutex=PlatformMutex"
1112
],
1213
"config": {
1314
"application-start-address": {

configs/test_configs/fake_rot_sd_card.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12-
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"
12+
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
13+
"Mutex=PlatformMutex"
1314
],
1415
"config": {
1516
"application-start-address": {

configs/test_configs/header_separate_after_app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12-
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"
12+
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
13+
"Mutex=PlatformMutex"
1314
],
1415
"config": {
1516
"application-start-address": {

configs/test_configs/header_separate_before_app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12-
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"
12+
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
13+
"Mutex=PlatformMutex"
1314
],
1415
"config": {
1516
"application-start-address": {

configs/test_configs/power_cut_test.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"ARM_BOOTLOADER_USE_NVSTORE_ROT=0",
1010
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12-
"BOOTLOADER_POWER_CUT_TEST=1"
12+
"BOOTLOADER_POWER_CUT_TEST=1",
13+
"Mutex=PlatformMutex"
1314
],
1415
"config": {
1516
"application-start-address": {

mbed-os.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-os/#261f73fbfd7fd906e0efe2c957d294a0dde02413
1+
https://github.com/ARMmbed/mbed-os/#485bdeee150e2bc8ed75e27d936060fb63a7a7d1

mbed_app.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"ARM_UC_USE_PAL_BLOCKDEVICE=1",
1010
"ARM_UC_PAAL_TRACE_ENABLE=0",
1111
"MBED_CLOUD_CLIENT_UPDATE_STORAGE=ARM_UCP_FLASHIAP_BLOCKDEVICE",
12-
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)"
12+
"DEFAULT_MAX_APPLICATION_SIZE=(MBED_CONF_APP_FLASH_START_ADDRESS + MBED_CONF_APP_FLASH_SIZE - MBED_CONF_APP_APPLICATION_START_ADDRESS)",
13+
"DISABLE_ERROR_DESCRIPTION=1",
14+
"Mutex=PlatformMutex"
1315
],
1416
"config": {
1517
"application-start-address": {

sd-driver.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/sd-driver/#f1bb57ae79bde0743dba046415e86b3201fd8fcf
1+
https://github.com/ARMmbed/sd-driver/#ae7e7440054c9447f8255bdccbcc523b3f6dffe4

0 commit comments

Comments
 (0)