Improved support for stm32mp1-disco#306
Merged
ricardosalveti merged 8 commits intofoundriesio:masterfrom Apr 9, 2021
Merged
Conversation
Member
ricardosalveti
commented
Apr 8, 2021
ricardosalveti
commented
- Switch to wic image format
- Use kernel config fragments from our main kernel meta tree
- Support for u-boot env and image update/rollback
ricardosalveti
requested review from
EmbeddedAndroid,
Tim-Anderson,
mike-scott and
munoz0raul
Tim-Anderson
approved these changes
Apr 8, 2021
Contributor
Tim-Anderson
left a comment
Tim-Anderson
left a comment
There was a problem hiding this comment.
just the one comment. all else LGTM
Comment on lines
+13
to
+15
| part fsbl1 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl1 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K --align 17 | ||
| part fsbl2 --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=fsbl2 --sourceparams="file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware/tf-a-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 256K | ||
| part ssbl --source rawcopy --fstype=ext4 --fsoptions "noauto" --part-name=ssbl --sourceparams="file=${DEPLOY_DIR_IMAGE}/bootloader/u-boot-stm32mp157c-dk2-trusted.stm32" --ondisk mmcblk --part-type 0x8301 --fixed-size 2048K |
Contributor
There was a problem hiding this comment.
Are they all suppose to be ext4? I thought that boot partition was fat/vfat/
Member
Author
There was a problem hiding this comment.
In this wks we don't have a vfat partition (for boot), these are special partitions for atf and u-boot (since this is gpt, they don't use an offset).
I didn't try if other fstypes would work the same way as I just copied that logic from https://github.com/STMicroelectronics/meta-st-stm32mp/blob/dunfell/wic/sdcard-stm32mp157c-dk2-trusted-vendorfs-1GB.wks.in.
Relevant changes: - 94ab2bee bsp: stm32mp1-disco: cleanup config (remove duplicates) - 3c17ce48 bsp: stm32mp1-disco: enable CONFIG_EFI_PARTITION Signed-off-by: Ricardo Salveti <[email protected]>
fw_env files for mmc, nand and nor are installed by default, but without a standard link the fw_* tools won't work without additional parameters. As we know disco uses mmc by default, create the appropriate link. Signed-off-by: Ricardo Salveti <[email protected]>
Provide lmp u-boot config fragment for disco, containing the required configuration settings and bootcommand (which includes support for update and rollback). boot.itb won't be required later on (boot firmware upgrade), so make the boot command logic as part of the default u-boot environment via boot command for now (this allows us to drop the vfat partition requirement). Signed-off-by: Ricardo Salveti <[email protected]>
wks file for stm32mp1-disco with sota support. Signed-off-by: Ricardo Salveti <[email protected]>
The preferred kernel fitimage class is kernel-lmp-fitimage. Signed-off-by: Ricardo Salveti <[email protected]>
Prefer standard wic image format instead of flashlayout. Signed-off-by: Ricardo Salveti <[email protected]>
Not required as initrd can be loaded and consumed from the default address used when loading the kernel fitimage. Signed-off-by: Ricardo Salveti <[email protected]>
Now that the u-boot environment is working correctly from u-boot and userspace, enable the sota ubootenv feature so it can be manipulated by aktualizr-lite during an update (for update and rollback support). Signed-off-by: Ricardo Salveti <[email protected]>
ricardosalveti
force-pushed
the
master-dev
branch
from
7f699b9 to
9e1be0d
Compare
angolini
approved these changes
Apr 9, 2021
Contributor
angolini
left a comment
angolini
left a comment
There was a problem hiding this comment.
LGTM. nothing to comment
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.