Skip to content

Commit f75d9f7

Browse files
authored
Backport changes from public src release (ARMmbed#94)
* Backport changes from public src release - Add note about Flash Layout in README - Fix compilation by polyfilling a pal function - update dependency to 1.3 RC13 - Expecitly set SOTP config file - Remove size data as out of date - Fix make_release.py script as the release single target feature broke normal release of all features * Add sotp config to test config file * Rename mbed-printf to minimal-printf
1 parent 797787f commit f75d9f7

18 files changed

+51
-455
lines changed

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ User **may** set in `mbed_app.json`:
4343
### The flash layout for K64F with SOTP and firmware storage on internal flash
4444
```
4545
+--------------------------+
46-
| LittelFS |
46+
| LittleFS |
4747
| (Does not concern |
4848
| Bootloader) | update-client.storage-address
4949
+--------------------------+ <-+ +
@@ -78,6 +78,12 @@ User **may** set in `mbed_app.json`:
7878
+--------------------------+ <-+ 0
7979
```
8080

81+
### Notes on Flash Layout
82+
- Internal Flash Only layout can be enabled by compiling the bootloader with the internal_flash_sotp.json configuration file `--app-config configs/internal_flash_sotp.json`. By default the firmware storage region and filesystem is on [external sd card](#external-storage).
83+
- The default flash layout is tested with GCC_ARM compiler and tiny.json compiler profile only. If a different compiler is used, the bootloader binary size will be larger and the offsets needs to be adjusted.
84+
- The SOTP regions require 1 flash erase sector each with at least 1k of space.
85+
- The LittleFS requires 2 flash sectors per folder and 1 sector per file as well as 2 sectors for the filesystem itself.
86+
8187
### Alignment
8288
**Flash Erase Boundary**: Flash can usually only be erased in blocks of specific sizes, this is platform specific and hence many regions need to align to this boundary.
8389

fix-mbed-os-compile/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

fix-mbed-os-compile/pal_polyfill.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <pal.h>
2+
3+
palStatus_t pal_osDelay(uint32_t milliseconds)
4+
{
5+
return PAL_SUCCESS;
6+
}

mbed-client-esfs.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-client-esfs/#2b1c9bf3752307eb32eea6f502aede7b086e7649
1+
https://github.com/ARMmbed/mbed-client-esfs/#cc6399a2f7b452ff41e1ae3ca442a5367c149243

mbed-client-pal.lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/ARMmbed/mbed-client-pal/#874ed03ef1be14a25191f3abb0fb566ffa4c3961
1+
https://github.com/ARMmbed/mbed-client-pal/#5ecbec62a88afc3031501a02ec73eb1b48042b63

mbed-printf.lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

mbed_app.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"macros": [
33
"MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\"",
4+
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
45
"MAX_COPY_RETRIES=1",
56
"SHOW_PROGRESS_BAR=1",
67
"MAX_BOOT_RETRIES=3",

minimal-printf.lib

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/ARMmbed/minimal-printf/#613c02ed3eeb09b86c7d0c6c9ae0059bd0c31ae1

power_cut_test/test_mbed_app.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"macros": [
33
"MBEDTLS_USER_CONFIG_FILE=\"mbedtls_mbed_client_config.h\"",
4+
"PAL_USER_DEFINED_CONFIGURATION=\"sotp_fs_config_MbedOS.h\"",
45
"MAX_COPY_RETRIES=1",
56
"SHOW_PROGRESS_BAR=1",
67
"MAX_BOOT_RETRIES=3",

scripts/make_release.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def find_offset(map_file, symbol):
232232
print "="*60
233233
parser.print_help()
234234
sys.exit(1)
235-
else:
235+
elif args.mcu and args.config:
236236
targets = [(args.mcu, args.config)]
237237

238238
# change default compiler profiles if specified

size_data/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

size_data/html/LICENSE

Lines changed: 0 additions & 13 deletions
This file was deleted.

size_data/html/data-flare.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

size_data/html/sequences.css

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)