Storage, rBoot and profile editor updates #2302
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…low addresses to be entered as size
… global config.schema object
Exclude partition subtype
…target if not valid
This emphasises that value can't be adjusted but still allows values to be overridden, for example to move partition to entirely different location.
As partition table no longer lives directly after bootloader, size must be specified explicitly
…e' format in schema
|
This pull request introduces 1 alert when merging 999cdc3 into 967b5d7 - view on LGTM.com new alerts:
|
|
@mikee47 Travis seems to be back from the dead and the builds are failing after trying to compile the storage component. For example this build produces the following compilation messages. Any idea how we can fix this? In file included from /home/travis/build/SmingHub/Sming/Sming/Wiring/WString.h:61,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/include/Storage/Device.h:12,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/include/Storage.h:12,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/Device.cpp:11:
/usr/include/string.h:36:43: error: missing binary operator before token "("
36 | #if defined __cplusplus && (__GNUC_PREREQ (4, 4) \
| ^
In file included from /home/travis/build/SmingHub/Sming/Sming/Wiring/WString.h:61,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/include/Storage/Device.h:12,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/include/Storage/CustomDevice.h:7,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/include/Storage/ProgMem.h:12,
from /home/travis/build/SmingHub/Sming/Sming/Components/Storage/src/ProgMem.cpp:11:
/usr/include/string.h:36:43: error: missing binary operator before token "("
36 | #if defined __cplusplus && (__GNUC_PREREQ (4, 4) \
| ^
/usr/include/string.h:53:62: error: missing binary operator before token "("
53 | #if defined __USE_MISC || defined __USE_XOPEN || __GLIBC_USE (ISOC2X)
| ^
/usr/include/string.h:165:21: error: missing binary operator before token "(" |
|
@slaff That error looks familiar - I suspect it's got to do with multilib. Try removing the |
|
The ESP8266 compilation is failing and not the Host compilation, as far as I can see. But its worth trying. I will push the different changes here: https://github.com/slaff/Sming/tree/fix/travis-build |
|
It's trying to build the fscopy tool in Host mode... though yes now I see that the host build itself succeeded... weird. |
|
Sorry, you are right. It is indeed Host compilation happening for some reason in the Esp8266 travis build. |
|
The tool is built from LittleFS component. One problem with spawning a Host build is that all the Esp8266 build variables are propagated through the environment. Is there a way to spawn a 'clean' shell to do the build? |
This should work for bash |
slaff
pushed a commit
that referenced
this pull request
Sep 27, 2021
**Fixes**
- Unexpectedly get 'no partitions have build targets' error when attempting to build partition targets
- Fix `SpiFlash::getId()` declaration (override keyword missing)
- Change partition sort order so devices are in same order as listed
- Fix problems when partition table offset is changed.
Must rebuild Storage library if partition table offset changes
Add `PARTITION_TABLE_OFFSET` relink dependency to rboot Component
- Change default partition alignment to 0x1000 (was 4)
- Add config `bootloader_size` field
As partition table no longer lives directly after bootloader, size must be specified explicitly.
**Editor fixes**
- Fix error in editor when file dialog cancelled
- Fix mis-identification of core profiles in editor.
Profiles within Library samples identified as core profile. Now only profiles in SMING_HOME or SMING_HOME/Arch/** are considered core.
- Ensure option lists are presented in sorted order
- Update view if 'add device' is cancelled
**Editor improvements**
- Allow floating point values with size multipliers (e.g. 1.5m), and allow addresses to be entered in this style
- Ensure selected item is visible in tree view
- Add `HWCONFIG_BUILDSPECS`
Components (SPIFFS, IFS) define their own schema for the editor to use when completing 'build' fields.
Add example to Basic_Storage sample for how to use custom project build specs.
- Show selected field description in status bar
- Add scale controls for address/size fields to reduce the need for manual calculations
- Change address/size text color if range is 0
This emphasises that value can't be adjusted but still allows values to be overridden,
for example to move partition to entirely different location.
- Output partitions in address (map) order
- Revise 'array' handling, keep 'enum' as per JsonSchema spec. which MUST be an array
- Add browse button for string fields marked with 'filename' or 'dirname' format in schema
- Move partitions.offset into config.partition_table_offset
Matches defined location within JSON files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes
SpiFlash::getId()declaration (override keyword missing)Must rebuild Storage library if partition table offset changes
Add
PARTITION_TABLE_OFFSETrelink dependency to rboot Componentbootloader_sizefieldAs partition table no longer lives directly after bootloader, size must be specified explicitly.
Editor fixes
Profiles within Library samples identified as core profile. Now only profiles in SMING_HOME or SMING_HOME/Arch/** are considered core.
Editor improvements
HWCONFIG_BUILDSPECSComponents (SPIFFS, IFS) define their own schema for the editor to use when completing 'build' fields.
Add example to Basic_Storage sample for how to use custom project build specs.
This emphasises that value can't be adjusted but still allows values to be overridden,
for example to move partition to entirely different location.
Matches defined location within JSON files