Commit Graph

46 Commits

Author SHA1 Message Date
Dominik Ermel c854c85ec7 snapshot: Update mcumgr to commit 12b496e3 from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 47fdde0c9a2bac821d2a814541e31d734dd78866
and the current top of the upstream:
  apache/mynewt-mcumgr 12b496e37caf20a45ab5aee4209b06c5d79ef9b1

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-10-12 18:00:47 +02:00
Dominik Ermel a7301143b3 snapshot: Update mcumgr to commit 47fdde0c from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr edb485cf471be3bc998b5c48866399a8a336ace5
and the current top of the upstream:
  apache/mynewt-mcumgr 47fdde0c9a2bac821d2a814541e31d734dd78866

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-10-06 17:36:19 -04:00
Dominik Ermel df9be73761 snapshot: Update mcumgr to commit edb485cf from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 75d6f6ea7b05895e654513fecd598a7229df427b
and the current top of the upstream:
  apache/mynewt-mcumgr edb485cf471be3bc998b5c48866399a8a336ace5

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-10-05 14:41:41 +02:00
Dominik Ermel 657deb658e snapshot: Update mcumgr to commit 75d6f6ea from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 1e0f283c71d90ee3aa2ca2ca97db2bb824ffa34b
and the current top of the upstream:
  apache/mynewt-mcumgr 75d6f6ea7b05895e654513fecd598a7229df427b

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-09-07 13:52:35 +02:00
Dominik Ermel 31a2aa9cea snapshot: Update mcumgr to commit 1e0f283c71 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 4fa869142f16e00d42415bc6dbcb7f1f92ba4abd
and the current top of the upstream:
  apache/mynewt-mcumgr 1e0f283c71d90ee3aa2ca2ca97db2bb824ffa34b

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-08-27 17:36:03 +02:00
Dominik Ermel a15a953e35 snapshot: Update mcumgr to commit 4fa869142f from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 64f5060bd8bb466367e0da94da8b425d5b9f6388
and the current top of the upstream:
  apache/mynewt-mcumgr 4fa869142f16e00d42415bc6dbcb7f1f92ba4abd

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-07-27 14:36:05 +02:00
Dominik Ermel 5c5055f5a7 snapshot: Update mcumgr to commit e64f5060bd from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr e289eaddc9b8e238b5683359a6b3207c70c2c0e7
and the current top of the upstream:
  apache/mynewt-mcumgr 64f5060bd8bb466367e0da94da8b425d5b9f6388

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-04-28 16:59:07 +02:00
Dominik Ermel 9f09bae7c0 snapshot: Update mcumgr to commit e289eaddc9 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr b92aa0b8c999afa285b83012cd5dd76e33a2c03a
and the current top of the upstream:
  apache/mynewt-mcumgr e289eaddc9b8e238b5683359a6b3207c70c2c0e7

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-03-08 17:00:55 +01:00
Dominik Ermel c52ecb771a snapshot: Update mcumgr to commit b92aa0b8c9 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 74e77ad08090c0e389a27118fdebe20783dca2e4
and the current top of the upstream:
  apache/mynewt-mcumgr b92aa0b8c999afa285b83012cd5dd76e33a2c03a

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2021-02-23 08:58:08 +01:00
Dominik Ermel 43845e883f snapshot: Update mcumgr to commit 74e77ad08 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 449bee75750ea4430d299b8da28c4f39b07f8b08
and the current top of the upstream:
  apache/mynewt-mcumgr 74e77ad08090c0e389a27118fdebe20783dca2e4

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-12-18 19:39:57 +01:00
Dominik Ermel 697e145d5e snapshot: Update mcumgr to commit 449bee from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr a3d5117b0888ca52b967886467b5bb350028c4ba
and the current top of the upstream:
  apache/mynewt-mcumgr 449bee75750ea4430d299b8da28c4f39b07f8b08

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-12-08 11:02:35 +01:00
Fabio Utzig f28a637db1 snapshot: Update mcumgr to commit a3d511 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 0bb466c34e4fe863733a929baa8f51981263ce3d
and the current top on the upstream:
  apache/mynewt-mcumgr a3d5117b0888ca52b967886467b5bb350028c4ba

Signed-off-by: Fabio Utzig <fabio.utzig@nordicsemi.no>
2020-11-09 14:14:01 +01:00
Fabio Utzig 1e5e3ecd5b snapshot: Update mcumgr to commit 0bb466 from upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
  apache/mynewt-mcumgr 8d087a7e0e5485394419d10051606c92d68d2111
and the current top on the upstream:
  apache/mynewt-mcumgr 0bb466c34e4fe863733a929baa8f51981263ce3d

Signed-off-by: Fabio Utzig <fabio.utzig@nordicsemi.no>
2020-10-19 18:37:43 +02:00
Dominik Ermel 5051f9d900 snapshot: Update mcumgr to commit 8d087a7e from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr 3fdb7fe0a59dd879f81569a4fb36ea4b44b83792
and the current top on the upstream:
 apache/mynewt-mcumgr 8d087a7e0e5485394419d10051606c92d68d2111

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-09-02 15:18:38 -05:00
Dominik Ermel cfe5eb98a9 snapshot: Update mcumgr to commit 32827ad6 from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr 7658d09f1c6ee2b778390854a9d90d74b39e9fca
and the current top on the upstream:
 apache/mynewt-mcumgr 32827ad6db87042c0979c18eeef2afa7714391e5

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-07-30 12:21:26 +02:00
Kumar Gala 898a5a7f52 snapshot: Update mcumgr to commit 7658d09f from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr 3fdb7fe0a59dd879f81569a4fb36ea4b44b83792
and the current top on the upstream:
 apache/mynewt-mcumgr 7658d09f1c6ee2b778390854a9d90d74b39e9fca

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
2020-06-05 22:30:27 +02:00
Dominik Ermel 5885efb7ca snapshot: Update mcumgr to commit 3fdb7fe0 from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr 9f6555ad032d16314fedc813824e7a521535c71e
and the current top on the upstream:
 apache/mynewt-mcumgr 3fdb7fe0a59dd879f81569a4fb36ea4b44b83792

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-05-15 15:33:20 +02:00
Kumar Gala 1f5234cad9 zephyr: Convert to new FLASH_AREA macros
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
2020-05-11 15:37:35 +02:00
Dominik Ermel ac6cc4f28f snapshot: Update mcumgr to commit 9f6555ad from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr 40341abeeac9c93b4aa59c20ee183376c7920d7e
and the current top on the upstream:
 apache/mynewt-mcumgr 9f6555ad032d16314fedc813824e7a521535c71e

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-05-05 15:30:34 +02:00
Dominik Ermel 1843fdce2b snapshot: Update mcumgr to commit 40341abe from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream:
 apache/mynewt-mcumgr f3b171f2d6d50b0b696f1307bb18e748727fbc80
and the current top on the upstream:
 apache/mynewt-mcumgr 40341abeeac9c93b4aa59c20ee183376c7920d7e

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-04-17 14:51:09 +02:00
Dominik Ermel dcf32c7f34 snapshot: Update mcumgr to commit f3b171f2 from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream
 apache/mynewt-mcumgr: c4919dab456ba383431b1936a6fd7524486f9718
and the current top on the upstream:
 apache/mynewt-mcumgr: f3b171f2d6d50b0b696f1307bb18e748727fbc80

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-03-25 11:38:09 +01:00
Dominik Ermel dd3b98f288 snapshot: Update mcumgr to commit c4919dab from the upstream
The commit applies changes that have appeared between the last snapshot
update from the upstream
 apache/mynewt-mcumgr: 98e8f320b487a775f49bf554ea29fe8958ab506f
and the current top on the upstream:
 apache/mynewt-mcumgr: c4919dab456ba383431b1936a6fd7524486f9718

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-03-24 12:27:46 +01:00
Dominik Ermel 301892dad2 snapshot: Update mcumgr to commit 98e8f320 from upstream
The commit applies changes that have appeared between last snapshot
update from upstream
 apache/mynewt-mcumgr: ae4659b445b707409fb17d626c806de3ed284720
and current top on upstream:
 apache/mynewt-mcumgr: 98e8f320b487a775f49bf554ea29fe8958ab506f

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-03-13 14:06:00 +01:00
Dominik Ermel 0a7149965a snapshot: Update mcumgr to commit ae4659b4 from upstream
The commit applies changes that have appeared between
 apache/mynewt-mcumgr:ae4659b445b707409fb17d626c806de3ed284720
and
 zephyrproject-rtos/mcumgr:d4e97cd4fc80ff949415062b1c83fd42929e8fe4

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
2020-03-10 14:58:06 +01:00
Peter A. Bigot d4e97cd4fc cmd: img_mgmt: fix driver include path
Zephyr will soon no longer add the drivers subdirectory of the include
hierarchy to the search path, so references to driver headers must
include the drivers/ prefix.

Upstream-Status: Backport [https://github.com/apache/mynewt-mcumgr/pull/58]
Signed-off-by: Peter A. Bigot <peter.bigot@nordicsemi.no>
2020-01-24 17:55:04 +01:00
Kumar Gala b18b3d1644 include: Fix zephyr includes to use non-deprecated header locations
Fix <stats.h> -> <stats/stats.h>,
Fix <sys/reboot.h> -> <power/reboot.h>

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
2019-12-09 21:06:35 -05:00
Kumar Gala 8adb80f1b9 include: Fix zephyr includes to use non-deprecated header locations
Fix includes to use <sys/FOO.h> instead of <misc/FOO.h> as well as a few
<fs/fs.h> instead of <fs.h> and <storage/flash_map.h> instead of
<flash_map.h>

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
2019-12-09 16:27:36 -05:00
Anas Nashif 84934959d2 kconfig: move Kconfig to main tree
Maintain MCUMGR kconfig in the Zephyr tree to keep dependencies intact.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-05-31 07:53:47 -04:00
Anas Nashif a69793cdb4 zephyr: add as a module
Add needed files to make this a zephyr module.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-05-22 22:38:35 -04:00
Ulf Magnusson 3442203c1e kconfig: Use a short consistent prompt style
Same change as in commit 8cf8db3a73 ("Kconfig: Use a short, consistent
style for prompts"), fixing stuff that got introduced since then.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
2019-02-27 09:23:30 +01:00
Anas Nashif 1fc126291a dfu: mcuboot: rename boot_swap_type> mcuboot_swap_type
This function conflicts with a function of the same name in mcuboot.
This happens when building USB DFU support into mcuboot.

DFU over USB uses image manager and mcuboot internals to manage images
downloaded to the device.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-02-19 09:32:02 +01:00
Carlos Stuart 08f60a6d3d include: misc: util.h: Rename min/max to MIN/MAX
There are issues using lowercase min and max macros when compiling a C++
application with a third-party toolchain such as GNU ARM Embedded when
using some STL headers i.e. <chrono>.

This is because there are actual C++ functions called min and max
defined in some of the STL headers and these macros interfere with them.
By changing the macros to UPPERCASE, which is consistent with almost all
other pre-processor macros this naming conflict is avoided.

All files that use these macros have been updated.

Signed-off-by: Carlos Stuart <carlosstuart1970@gmail.com>
2019-02-14 22:16:03 -05:00
Findlay Feng 6e52d92e52 ext/lib/mgmt/mcumgr: align zephyr port to changes in dfu sybsy'es
Changes in flash_map API makes flash_area structure proper
interface for point the image area instead of direct flash-bank-offsets.

This patch align code to changed APIa and allows to support operation
on the partition in any flash device.

Signed-off-by: Findlay Feng <i@fengch.me>
2019-02-08 09:13:09 -06:00
Anas Nashif f928693f68 ext: fix path to source files with new cmake
New cmake does not like source files not relative to current directory.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
2019-01-03 11:51:29 -05:00
Andrzej Głąbek 98954db13d dts_fixups: Use DT_ prefix in all defined labels not related to Kconfig
These changes were obtained by running a script  created by
Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> for the following
specification:

1. Read the contents of all dts_fixup.h files in Zephyr
2. Check the left-hand side of the #define macros (i.e. the X in
   #define X Y)
3. Check if that name is also the name of a Kconfig option
   3.a If it is, then do nothing
   3.b If it is not, then replace CONFIG_ with DT_ or add DT_ if it
       has neither of these two prefixes
4. Replace the use of the changed #define in the code itself
   (.c, .h, .ld)

Additionally, some tweaks had to be added to this script to catch some
of the macros used in the code in a parameterized form, e.g.:
- CONFIG_GPIO_STM32_GPIO##__SUFFIX##_BASE_ADDRESS
- CONFIG_UART_##idx##_TX_PIN
- I2C_SBCON_##_num##_BASE_ADDR
and to prevent adding DT_ prefix to the following symbols:
- FLASH_START
- FLASH_SIZE
- SRAM_START
- SRAM_SIZE
- _ROM_ADDR
- _ROM_SIZE
- _RAM_ADDR
- _RAM_SIZE
which are surprisingly also defined in some dts_fixup.h files.

Finally, some manual corrections had to be done as well:
- name##_IRQ -> DT_##name##_IRQ in uart_stm32.c

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
2018-11-13 10:44:42 -06:00
Szymon Janc c27cf45d67 ext: lib: mgmt: mcumgr: update to latest master
This patch introduce version which add two new features:
 - ability to resume partial upload
 - option to not compile taskstat and echo commands

Origin: mcumgr
License: Apache 2.0
URL: https://github.com/apache/mynewt-mcumgr
Commit: 6251689367
Purpose: New features
Maintained-by: External

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
2018-11-04 22:01:56 +01:00
Andrzej Puzdrowski 314670fdba ext: lib: mgmt: mcumgr: update to latest master
This patch introduce version which fixes following bug:

It was possible to erase slot 1 while it stores confirmed image
while ongoing test run - this is unwanted behavior which allow
to even brick remote device accidentally.
This patch add check for such case of test run etc.
This also aligns condition required for erase command
execution to similar as upload command requires.

Origin: mcumgr
License: Apache 2.0
URL: https://github.com/apache/mynewt-mcumgr
Commit: 91a76b95b1
Purpose: Bug Fix
Maintained-by: External

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
2018-10-04 10:34:22 +02:00
Ulf Magnusson 630aace4b4 Kconfig: Use a short, consistent style for prompts
Consistently use

    config FOO
            bool/int/hex/string "Prompt text"

instead of

    config FOO
            bool/int/hex/string
            prompt "Prompt text"

(...and a bunch of other variations that e.g. swapped the order of the
type and the 'prompt', or put other properties between them).

The shorthand is fully equivalent to using 'prompt'. It saves lines and
avoids tricking people into thinking there is some semantic difference.

Most of the grunt work was done by a modified version of
https://unix.stackexchange.com/questions/26284/
how-can-i-use-sed-to-replace-a-multi-line-string/26290#26290, but some
of the rarer variations had to be converted manually.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
2018-08-15 04:10:10 -07:00
Johannes Hutter d9b889ecd2 ext: lib: mgmt: mcumgr: update to latest master
This update to the latest master of mcumgr fixes a memory corruption in
the image management and updates the readme.

Fixes #7924

Origin: mcumgr
License: Apache 2.0
URL: https://github.com/apache/mynewt-mcumgr
commit: a837a731b9
Purpose: Fix memory corruption
Maintained-by: External

Signed-off-by: Johannes Hutter <johannes@proglove.de>
2018-07-04 11:59:12 +02:00
Ulf Magnusson 016bc1865e ext: Kconfig: Remove redundant 'default n' properties
Bool symbols implicitly default to 'n'.

A 'default n' could make sense e.g. in a Kconfig.defconfig file, if you
wanted to override a 'default y' on the base definition of the symbol,
but it doesn't seem to be used like that on any of these symbols.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
2018-06-18 15:26:38 -04:00
Ulf Magnusson 80a10dc2a4 ext: lib: mgmt: Remove MDLOG Kconfig reference
This symbol never seems to have been defined.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
2018-06-13 13:35:56 -04:00
Ulf Magnusson 9d12ba49ed kconfig: Remove no-op selects of choice symbols
Selecting a choice symbol is always a no-op, and the latest version of
Kconfiglib prints a warning. This commit removes all selects of choice
symbols, which might make the Kconfig files a bit clearer and gets rid
of the warnings.

This is just a dumb removal. I did not try to guess the intent of each
select.

Fixes #6849

Signed-off-by: Ulf Magnusson <ulfalizer@gmail.com>
2018-03-29 08:57:39 -04:00
Kumar Gala 227bf65866 subsys: fs: Fix fs_file_t and fs_dir_t usage
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>
2018-03-13 09:47:58 -05:00
Sebastian Bøe 2002dcd99a kconfig: Removed source "[...]mgmt/mcumgr/mgmt/port/zephyr/Kconfig"
This Kconfig 'source' statement had no effect as it was referencing a
non-existing Kconfig file. It is not clear if the intention is to
include-if-exists, but I presume not.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
2018-03-13 09:39:42 -05:00
Christopher Collins 0a7d14b867 ext: lib: mgmt: mcumgr: Build support for mcumgr.
Adds the necessary CMakeLists.txt and Kconfig files to build the
external mcumgr library.

Signed-off-by: Christopher Collins <ccollins@apache.org>
2018-02-20 22:07:52 +01:00
Christopher Collins deadab4d09 ext: lib: mgmt: mcumgr management infrastructure.
The goal of mcumgr is to define a common management infrastructure with
pluggable transport and encoding components.  In addition, mcumgr
provides definitions and handlers for some core commands: e.g., image
management, file system management, and OS managment.

Origin: mcumgr
License: Apache 2.0
URL: https://github.com/apache/mynewt-mcumgr
commit: 59210e372c
Purpose: Introduction of mcumgr
Maintained-by: External

Signed-off-by: Christopher Collins <ccollins@apache.org>
2018-02-20 22:07:52 +01:00