utzig closed pull request #7: Upstreaming of Zephyr downstream modifications
URL: https://github.com/apache/mynewt-mcumgr/pull/7
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Kconfig b/Kconfig
index 83eaeaa..15b546e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -19,12 +19,10 @@ config MCUMGR
bool
prompt "mcumgr Support"
select TINYCBOR
- default n
help
This option enables the mcumgr management library.
if MCUMGR
-source "ext/lib/mgmt/mcumgr/mgmt/port/zephyr/Kconfig"
source "ext/lib/mgmt/mcumgr/cmd/Kconfig"
config APP_LINK_WITH_MCUMGR
diff --git a/cmd/fs_mgmt/Kconfig b/cmd/fs_mgmt/Kconfig
index ccbcf17..dae3ad7 100644
--- a/cmd/fs_mgmt/Kconfig
+++ b/cmd/fs_mgmt/Kconfig
@@ -19,7 +19,6 @@ menuconfig MCUMGR_CMD_FS_MGMT
bool
prompt "Enable mcumgr handlers for file management"
depends on FILE_SYSTEM
- default n
help
Enables mcumgr handlers for file management
diff --git a/cmd/fs_mgmt/port/zephyr/src/zephyr_fs_mgmt.c
b/cmd/fs_mgmt/port/zephyr/src/zephyr_fs_mgmt.c
index 754d3c3..231a0f8 100644
--- a/cmd/fs_mgmt/port/zephyr/src/zephyr_fs_mgmt.c
+++ b/cmd/fs_mgmt/port/zephyr/src/zephyr_fs_mgmt.c
@@ -45,7 +45,7 @@ int
fs_mgmt_impl_read(const char *path, size_t offset, size_t len,
void *out_data, size_t *out_len)
{
- fs_file_t file;
+ struct fs_file_t file;
ssize_t bytes_read;
int rc;
@@ -109,7 +109,7 @@ int
fs_mgmt_impl_write(const char *path, size_t offset, const void *data,
size_t len)
{
- fs_file_t file;
+ struct fs_file_t file;
int rc;
/* Truncate the file before writing the first chunk. This is done to
diff --git a/cmd/img_mgmt/Kconfig b/cmd/img_mgmt/Kconfig
index 3a581c6..73f0df0 100644
--- a/cmd/img_mgmt/Kconfig
+++ b/cmd/img_mgmt/Kconfig
@@ -21,9 +21,6 @@ menuconfig MCUMGR_CMD_IMG_MGMT
select FLASH
select MPU_ALLOW_FLASH_WRITE if CPU_HAS_MPU
select IMG_MANAGER
- select MCUBOOT_IMG_MANAGER
-
- default n
help
Enables mcumgr handlers for image management
diff --git a/cmd/log_mgmt/Kconfig b/cmd/log_mgmt/Kconfig
index 9373571..201c6e0 100644
--- a/cmd/log_mgmt/Kconfig
+++ b/cmd/log_mgmt/Kconfig
@@ -18,8 +18,6 @@
menuconfig MCUMGR_CMD_LOG_MGMT
bool
prompt "Enable mcumgr handlers for log management"
- depends on MDLOG
- default n
help
Enables mcumgr handlers for log management
diff --git a/cmd/os_mgmt/Kconfig b/cmd/os_mgmt/Kconfig
index 10f0abc..4be58ba 100644
--- a/cmd/os_mgmt/Kconfig
+++ b/cmd/os_mgmt/Kconfig
@@ -19,7 +19,6 @@ menuconfig MCUMGR_CMD_OS_MGMT
bool
prompt "Enable mcumgr handlers for OS management"
select REBOOT
- default n
help
Enables mcumgr handlers for OS management
diff --git a/cmd/stat_mgmt/Kconfig b/cmd/stat_mgmt/Kconfig
index 3688ed1..9c5ae18 100644
--- a/cmd/stat_mgmt/Kconfig
+++ b/cmd/stat_mgmt/Kconfig
@@ -19,7 +19,6 @@ menuconfig MCUMGR_CMD_STAT_MGMT
bool
prompt "Enable mcumgr handlers for statistics management"
depends on STATS
- default n
help
Enables mcumgr handlers for statistics management.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
