Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstreaming of Zephyr downstream modifications #7

Merged
merged 2 commits into from
Jul 3, 2018
Merged

Upstreaming of Zephyr downstream modifications #7

merged 2 commits into from
Jul 3, 2018

Conversation

carlescufi
Copy link
Contributor

No description provided.

@carlescufi
zephyr: Fix fs_file_t and fs_dir_t usage
51ffa6d 
With the introduce of VFS the typedef for fs_file_t & fs_dir_t don't
exist anymore so we need to use 'struct fs_dir_t' or 'struct
fs_file_t'.
Fix up some places that got missed in the VFS conversion.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@carlescufi
Copy link
Contributor Author

CC @utzig @ccollins476ad @JoeHut

@carlescufi carlescufi changed the title Upstream of Zephyr downstream modifications Upstreaming of Zephyr downstream modifications Jul 3, 2018
@JoeHut
Copy link
Contributor

JoeHut commented Jul 3, 2018

Looks like that is everything 👍

$ diff -r mynewt-mcumgr zephyr/ext/lib/mgmt/mcumgr 
Only in mynewt-mcumgr/cborattr: pkg.yml
Only in mynewt-mcumgr/cborattr: syscfg.yml
Only in mynewt-mcumgr/cborattr: test
Only in mynewt-mcumgr/cmd/fs_mgmt: pkg.yml
Only in mynewt-mcumgr/cmd/fs_mgmt/port: mynewt
Only in mynewt-mcumgr/cmd/fs_mgmt: syscfg.yml
Only in mynewt-mcumgr/cmd/img_mgmt: pkg.yml
Only in mynewt-mcumgr/cmd/img_mgmt/port: mynewt
diff -r mynewt-mcumgr/cmd/img_mgmt/src/img_mgmt_state.c zephyr/ext/lib/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c
254,258c254
<     /*
<      * We add 1 to the 32-byte hash buffer as _cbor_value_copy_string() adds
<      * a null character at the end of the buffer.
<      */
<     uint8_t hash[IMAGE_HASH_LEN + 1];
---
>     uint8_t hash[IMAGE_HASH_LEN];
Only in mynewt-mcumgr/cmd/img_mgmt: syscfg.yml
Only in mynewt-mcumgr/cmd/log_mgmt/port: mynewt
Only in mynewt-mcumgr/cmd/os_mgmt: pkg.yml
Only in mynewt-mcumgr/cmd/os_mgmt/port: mynewt
Only in mynewt-mcumgr/cmd/os_mgmt: syscfg.yml
Only in mynewt-mcumgr: .git
Only in mynewt-mcumgr: .gitignore
Only in mynewt-mcumgr/mgmt: pkg.yml
Only in mynewt-mcumgr/mgmt: syscfg.yml
diff -r mynewt-mcumgr/README.md zephyr/ext/lib/mgmt/mcumgr/README.md
19,20c19,20
< * [Mynewt](README-mynewt.md)
< * [Zephyr](README-zephyr.md)
---
> * README-mynewt.md
> * README-zephyr.md
Only in mynewt-mcumgr: repository.yml
Only in mynewt-mcumgr: samples
Only in mynewt-mcumgr/smp: pkg.yml

@carlescufi
zephyr: kconfig: Backport fixes
de59a07 
Several Kconfig fixes that were applied since MCUmgr was imported into Zephyr
are now reapplied into MCUmgr.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
@utzig utzig merged commit a837a73 into apache:master Jul 3, 2018
@carlescufi
Copy link
Contributor Author

@utzig thanks!

mlaz pushed a commit to mlaz/mynewt-mcumgr that referenced this pull request Sep 13, 2019
@vrahane
Merge pull request apache#7 from mlaz/travis-testing
1a2f40e 
cborattr_encode_omit test now runs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@utzig utzig utzig approved these changes

@JoeHut JoeHut JoeHut approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@carlescufi @JoeHut @utzig