apache / mynewt-mcumgr

Apache mynewt
https://mynewt.apache.org/
99 stars 76 forks source link

Upstreaming of Zephyr downstream modifications #7

Closed carlescufi closed 6 years ago

carlescufi commented 6 years ago

CC @utzig @ccollins476ad @JoeHut

JoeHut commented 6 years ago

Looks like that is everything :+1:

$ 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 commented 6 years ago

@utzig thanks!