You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by gi...@apache.org on 2024/07/10 21:46:11 UTC

(mynewt-nimble) branch update-ports-syscfg updated (e04b5cc5 -> 7eeaff43)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch update-ports-syscfg
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


    omit e04b5cc5 porting: Update ports syscfg
     new 7eeaff43 porting: Update ports syscfg

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e04b5cc5)
            \
             N -- N -- N   refs/heads/update-ports-syscfg (7eeaff43)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 porting/examples/linux_blemesh/include/syscfg/syscfg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


(mynewt-nimble) 01/01: porting: Update ports syscfg

Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch update-ports-syscfg
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git

commit 7eeaff433fe7315a79ba01159b4d8368785dcf05
Author: sjanc <10...@users.noreply.github.com>
AuthorDate: Wed Jul 10 21:45:31 2024 +0000

    porting: Update ports syscfg
---
 porting/examples/linux/include/syscfg/syscfg.h     |  82 +--
 .../examples/linux_blemesh/include/syscfg/syscfg.h | 111 +----
 porting/examples/nuttx/include/syscfg/syscfg.h     |  84 +---
 porting/nimble/include/syscfg/syscfg.h             |  79 +--
 porting/npl/riot/include/syscfg/syscfg.h           | 554 ++++++++++++++++-----
 5 files changed, 523 insertions(+), 387 deletions(-)

diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h
index 3c62cc3c..07d3945c 100644
--- a/porting/examples/linux/include/syscfg/syscfg.h
+++ b/porting/examples/linux/include/syscfg/syscfg.h
@@ -1,21 +1,28 @@
-/**
- * This file was generated by Apache newt version: 1.12.0
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef H_MYNEWT_SYSCFG_
 #define H_MYNEWT_SYSCFG_
 
-/**
- * This macro exists to ensure code includes this header when needed.  If code
- * checks the existence of a setting directly via ifdef without including this
- * header, the setting macro will silently evaluate to 0.  In contrast, an
- * attempt to use these macros without including this header will result in a
- * compiler error.
- */
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
 
-/*** @apache-mynewt-core/crypto/tinycrypt */
 #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE
 #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200)
 #endif
@@ -28,12 +35,10 @@
 #define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0)
 #endif
 
-/*** @apache-mynewt-core/hw/bsp/native */
 #ifndef MYNEWT_VAL_BSP_SIMULATED
 #define MYNEWT_VAL_BSP_SIMULATED (1)
 #endif
 
-/*** @apache-mynewt-core/hw/hal */
 #ifndef MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS
 #define MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS (1)
 #endif
@@ -62,7 +67,6 @@
 #define MYNEWT_VAL_HAL_SYSTEM_RESET_CB (0)
 #endif
 
-/*** @apache-mynewt-core/hw/mcu/native */
 #ifndef MYNEWT_VAL_I2C_0
 #define MYNEWT_VAL_I2C_0 (0)
 #endif
@@ -95,7 +99,6 @@
 #define MYNEWT_VAL_MCU_UART_POLLER_PRIO (1)
 #endif
 
-/*** @apache-mynewt-core/kernel/os */
 #ifndef MYNEWT_VAL_FLOAT_USER
 #define MYNEWT_VAL_FLOAT_USER (0)
 #endif
@@ -152,7 +155,6 @@
 #define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CRASH_FILE_LINE
 #define MYNEWT_VAL_OS_CRASH_FILE_LINE (1)
 #endif
@@ -197,7 +199,6 @@
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MAX (600000)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN (1)
 #endif
@@ -266,7 +267,6 @@
 #define MYNEWT_VAL_OS_TASK_RUN_TIME_CPUTIME (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_TICKS_PER_SEC
 #define MYNEWT_VAL_OS_TICKS_PER_SEC (100)
 #endif
@@ -287,7 +287,6 @@
 #define MYNEWT_VAL_WATCHDOG_INTERVAL (30000)
 #endif
 
-/*** @apache-mynewt-core/net/ip/native_sockets */
 #ifndef MYNEWT_VAL_NATIVE_SOCKETS_MAX
 #define MYNEWT_VAL_NATIVE_SOCKETS_MAX (8)
 #endif
@@ -314,7 +313,6 @@
 #define MYNEWT_VAL_NATIVE_SOCKETS_SYSINIT_STAGE (200)
 #endif
 
-/*** @apache-mynewt-core/sys/console/stub */
 #ifndef MYNEWT_VAL_CONSOLE_UART_BAUD
 #define MYNEWT_VAL_CONSOLE_UART_BAUD (115200)
 #endif
@@ -327,7 +325,6 @@
 #define MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL (UART_FLOW_CTL_NONE)
 #endif
 
-/*** @apache-mynewt-core/sys/flash_map */
 #ifndef MYNEWT_VAL_FLASH_MAP_MAX_AREAS
 #define MYNEWT_VAL_FLASH_MAP_MAX_AREAS (10)
 #endif
@@ -340,7 +337,6 @@
 #define MYNEWT_VAL_FLASH_MAP_SYSINIT_STAGE (9)
 #endif
 
-/*** @apache-mynewt-core/sys/log/common */
 #ifndef MYNEWT_VAL_DFLT_LOG_LVL
 #define MYNEWT_VAL_DFLT_LOG_LVL (1)
 #endif
@@ -353,7 +349,6 @@
 #define MYNEWT_VAL_LOG_GLOBAL_IDX (1)
 #endif
 
-/*** @apache-mynewt-core/sys/log/modlog */
 #ifndef MYNEWT_VAL_MODLOG_CONSOLE_DFLT
 #define MYNEWT_VAL_MODLOG_CONSOLE_DFLT (1)
 #endif
@@ -374,7 +369,6 @@
 #define MYNEWT_VAL_MODLOG_SYSINIT_STAGE (100)
 #endif
 
-/*** @apache-mynewt-core/sys/log/stub */
 #ifndef MYNEWT_VAL_LOG_CONSOLE
 #define MYNEWT_VAL_LOG_CONSOLE (1)
 #endif
@@ -387,17 +381,14 @@
 #define MYNEWT_VAL_LOG_FCB_SLOT1 (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-core/sys/log/stub) */
 #ifndef MYNEWT_VAL_LOG_LEVEL
 #define MYNEWT_VAL_LOG_LEVEL (0)
 #endif
 
-/*** @apache-mynewt-core/sys/sys */
 #ifndef MYNEWT_VAL_DEBUG_PANIC_ENABLED
 #define MYNEWT_VAL_DEBUG_PANIC_ENABLED (1)
 #endif
 
-/*** @apache-mynewt-core/sys/sysdown */
 #ifndef MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN
 #define MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN (1)
 #endif
@@ -414,27 +405,26 @@
 #define MYNEWT_VAL_SYSDOWN_TIMEOUT_MS (10000)
 #endif
 
-/*** @apache-mynewt-core/sys/sysinit */
 #ifndef MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT
 #define MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE
 #define MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_MESSAGE
 #define MYNEWT_VAL_SYSINIT_PANIC_MESSAGE (1)
 #endif
 
-/*** @apache-mynewt-core/util/rwlock */
 #ifndef MYNEWT_VAL_RWLOCK_DEBUG
 #define MYNEWT_VAL_RWLOCK_DEBUG (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble */
+#ifndef MYNEWT_VAL_BLE_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_CONN_SUBRATING
 #define MYNEWT_VAL_BLE_CONN_SUBRATING (0)
 #endif
@@ -531,7 +521,6 @@
 #define MYNEWT_VAL_BLE_WHITELIST (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
 #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
 #endif
@@ -892,7 +881,6 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ans */
 #ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
 #define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
 #endif
@@ -905,7 +893,6 @@
 #define MYNEWT_VAL_BLE_SVC_ANS_UNR_ALERT_CAT (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/bas */
 #ifndef MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE
 #define MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE (1)
 #endif
@@ -918,7 +905,6 @@
 #define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/dis */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM (-1)
 #endif
@@ -927,7 +913,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM (-1)
 #endif
@@ -936,7 +921,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM (-1)
 #endif
@@ -945,7 +929,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM (-1)
 #endif
@@ -962,7 +945,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM (-1)
 #endif
@@ -971,7 +953,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM (-1)
 #endif
@@ -984,12 +965,10 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM (-1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gap */
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #endif
@@ -1034,32 +1013,26 @@
 #define MYNEWT_VAL_BLE_SVC_GAP_SYSINIT_STAGE (301)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gatt */
 #ifndef MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ias */
 #ifndef MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ipss */
 #ifndef MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/lls */
 #ifndef MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/tps */
 #ifndef MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
 #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
 
 #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
@@ -1118,12 +1091,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT (10)
 #endif
@@ -1173,12 +1144,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
 #endif
@@ -1187,7 +1156,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
 #define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
 #endif
@@ -1216,7 +1184,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport/socket */
 #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500)
 #endif
@@ -1225,12 +1192,10 @@
 #define MYNEWT_VAL_BLE_SOCK_LINUX_DEV (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_STACK_SIZE
 #define MYNEWT_VAL_BLE_SOCK_STACK_SIZE (1028)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_TASK_PRIO
 #define MYNEWT_VAL_BLE_SOCK_TASK_PRIO (3)
 #endif
@@ -1239,7 +1204,6 @@
 #define MYNEWT_VAL_BLE_SOCK_TCP_PORT (14433)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE
 #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1)
 #endif
@@ -1248,12 +1212,10 @@
 #define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP
 #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0)
 #endif
 
-/*** newt */
 #ifndef MYNEWT_VAL_APP_NAME
 #define MYNEWT_VAL_APP_NAME "dummy_app"
 #endif
@@ -1294,7 +1256,6 @@
 #define MYNEWT_VAL_TARGET_linux (1)
 #endif
 
-/*** Included packages */
 #define MYNEWT_PKG_apache_mynewt_core__compiler_sim 1
 #define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_native 1
@@ -1339,7 +1300,6 @@
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_linux 1
 
-/*** Included APIs */
 #define MYNEWT_API_TRNG_HW_IMPL 1
 #define MYNEWT_API_ble_transport 1
 #define MYNEWT_API_console 1
diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h
index e16ecb5b..a476d889 100644
--- a/porting/examples/linux_blemesh/include/syscfg/syscfg.h
+++ b/porting/examples/linux_blemesh/include/syscfg/syscfg.h
@@ -1,21 +1,28 @@
-/**
- * This file was generated by Apache newt version: 1.12.0
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef H_MYNEWT_SYSCFG_
 #define H_MYNEWT_SYSCFG_
 
-/**
- * This macro exists to ensure code includes this header when needed.  If code
- * checks the existence of a setting directly via ifdef without including this
- * header, the setting macro will silently evaluate to 0.  In contrast, an
- * attempt to use these macros without including this header will result in a
- * compiler error.
- */
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
 
-/*** @apache-mynewt-core/crypto/tinycrypt */
 #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE
 #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200)
 #endif
@@ -28,12 +35,10 @@
 #define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0)
 #endif
 
-/*** @apache-mynewt-core/hw/bsp/native */
 #ifndef MYNEWT_VAL_BSP_SIMULATED
 #define MYNEWT_VAL_BSP_SIMULATED (1)
 #endif
 
-/*** @apache-mynewt-core/hw/hal */
 #ifndef MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS
 #define MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS (1)
 #endif
@@ -62,7 +67,6 @@
 #define MYNEWT_VAL_HAL_SYSTEM_RESET_CB (0)
 #endif
 
-/*** @apache-mynewt-core/hw/mcu/native */
 #ifndef MYNEWT_VAL_I2C_0
 #define MYNEWT_VAL_I2C_0 (0)
 #endif
@@ -95,12 +99,10 @@
 #define MYNEWT_VAL_MCU_UART_POLLER_PRIO (1)
 #endif
 
-/*** @apache-mynewt-core/kernel/os */
 #ifndef MYNEWT_VAL_FLOAT_USER
 #define MYNEWT_VAL_FLOAT_USER (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT
 #define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (80)
 #endif
@@ -153,7 +155,6 @@
 #define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CRASH_FILE_LINE
 #define MYNEWT_VAL_OS_CRASH_FILE_LINE (1)
 #endif
@@ -198,7 +199,6 @@
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MAX (600000)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN (1)
 #endif
@@ -267,7 +267,6 @@
 #define MYNEWT_VAL_OS_TASK_RUN_TIME_CPUTIME (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_TICKS_PER_SEC
 #define MYNEWT_VAL_OS_TICKS_PER_SEC (100)
 #endif
@@ -288,7 +287,6 @@
 #define MYNEWT_VAL_WATCHDOG_INTERVAL (30000)
 #endif
 
-/*** @apache-mynewt-core/net/ip/native_sockets */
 #ifndef MYNEWT_VAL_NATIVE_SOCKETS_MAX
 #define MYNEWT_VAL_NATIVE_SOCKETS_MAX (8)
 #endif
@@ -315,7 +313,6 @@
 #define MYNEWT_VAL_NATIVE_SOCKETS_SYSINIT_STAGE (200)
 #endif
 
-/*** @apache-mynewt-core/sys/console/stub */
 #ifndef MYNEWT_VAL_CONSOLE_UART_BAUD
 #define MYNEWT_VAL_CONSOLE_UART_BAUD (115200)
 #endif
@@ -328,7 +325,6 @@
 #define MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL (UART_FLOW_CTL_NONE)
 #endif
 
-/*** @apache-mynewt-core/sys/flash_map */
 #ifndef MYNEWT_VAL_FLASH_MAP_MAX_AREAS
 #define MYNEWT_VAL_FLASH_MAP_MAX_AREAS (10)
 #endif
@@ -341,7 +337,6 @@
 #define MYNEWT_VAL_FLASH_MAP_SYSINIT_STAGE (9)
 #endif
 
-/*** @apache-mynewt-core/sys/log/common */
 #ifndef MYNEWT_VAL_DFLT_LOG_LVL
 #define MYNEWT_VAL_DFLT_LOG_LVL (1)
 #endif
@@ -354,7 +349,6 @@
 #define MYNEWT_VAL_LOG_GLOBAL_IDX (1)
 #endif
 
-/*** @apache-mynewt-core/sys/log/modlog */
 #ifndef MYNEWT_VAL_MODLOG_CONSOLE_DFLT
 #define MYNEWT_VAL_MODLOG_CONSOLE_DFLT (1)
 #endif
@@ -375,7 +369,6 @@
 #define MYNEWT_VAL_MODLOG_SYSINIT_STAGE (100)
 #endif
 
-/*** @apache-mynewt-core/sys/log/stub */
 #ifndef MYNEWT_VAL_LOG_CONSOLE
 #define MYNEWT_VAL_LOG_CONSOLE (1)
 #endif
@@ -388,17 +381,14 @@
 #define MYNEWT_VAL_LOG_FCB_SLOT1 (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-core/sys/log/stub) */
 #ifndef MYNEWT_VAL_LOG_LEVEL
 #define MYNEWT_VAL_LOG_LEVEL (0)
 #endif
 
-/*** @apache-mynewt-core/sys/sys */
 #ifndef MYNEWT_VAL_DEBUG_PANIC_ENABLED
 #define MYNEWT_VAL_DEBUG_PANIC_ENABLED (1)
 #endif
 
-/*** @apache-mynewt-core/sys/sysdown */
 #ifndef MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN
 #define MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN (1)
 #endif
@@ -415,27 +405,26 @@
 #define MYNEWT_VAL_SYSDOWN_TIMEOUT_MS (10000)
 #endif
 
-/*** @apache-mynewt-core/sys/sysinit */
 #ifndef MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT
 #define MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE
 #define MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_MESSAGE
 #define MYNEWT_VAL_SYSINIT_PANIC_MESSAGE (1)
 #endif
 
-/*** @apache-mynewt-core/util/rwlock */
 #ifndef MYNEWT_VAL_RWLOCK_DEBUG
 #define MYNEWT_VAL_RWLOCK_DEBUG (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble */
+#ifndef MYNEWT_VAL_BLE_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_CONN_SUBRATING
 #define MYNEWT_VAL_BLE_CONN_SUBRATING (0)
 #endif
@@ -532,7 +521,6 @@
 #define MYNEWT_VAL_BLE_WHITELIST (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
 #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
 #endif
@@ -821,7 +809,6 @@
 #define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_MESH
 #define MYNEWT_VAL_BLE_MESH (1)
 #endif
@@ -870,7 +857,6 @@
 #define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/nimble/host (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_SM_SC
 #define MYNEWT_VAL_BLE_SM_SC (1)
 #endif
@@ -895,7 +881,6 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/mesh */
 #ifndef MYNEWT_VAL_BLE_MESH_ACCESS_LAYER_MSG
 #define MYNEWT_VAL_BLE_MESH_ACCESS_LAYER_MSG (1)
 #endif
@@ -912,7 +897,6 @@
 #define MYNEWT_VAL_BLE_MESH_ADV (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_ADV_BUF_COUNT
 #define MYNEWT_VAL_BLE_MESH_ADV_BUF_COUNT (20)
 #endif
@@ -941,7 +925,6 @@
 #define MYNEWT_VAL_BLE_MESH_ADV_TASK_PRIO (9)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_APP_KEY_COUNT
 #define MYNEWT_VAL_BLE_MESH_APP_KEY_COUNT (4)
 #endif
@@ -974,7 +957,6 @@
 #define MYNEWT_VAL_BLE_MESH_CDB_SUBNET_COUNT (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_CFG_CLI
 #define MYNEWT_VAL_BLE_MESH_CFG_CLI (1)
 #endif
@@ -1015,7 +997,6 @@
 #define MYNEWT_VAL_BLE_MESH_DEV_UUID (((uint8_t[16]){0x11, 0x22, 0}))
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_FRIEND
 #define MYNEWT_VAL_BLE_MESH_FRIEND (1)
 #endif
@@ -1056,7 +1037,6 @@
 #define MYNEWT_VAL_BLE_MESH_GATT (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_GATT_PROXY
 #define MYNEWT_VAL_BLE_MESH_GATT_PROXY (1)
 #endif
@@ -1089,12 +1069,10 @@
 #define MYNEWT_VAL_BLE_MESH_IV_UPDATE_SEQ_LIMIT (0x800000)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_IV_UPDATE_TEST
 #define MYNEWT_VAL_BLE_MESH_IV_UPDATE_TEST (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_LABEL_COUNT
 #define MYNEWT_VAL_BLE_MESH_LABEL_COUNT (2)
 #endif
@@ -1111,7 +1089,6 @@
 #define MYNEWT_VAL_BLE_MESH_LOOPBACK_BUFS (3)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_LOW_POWER
 #define MYNEWT_VAL_BLE_MESH_LOW_POWER (1)
 #endif
@@ -1124,7 +1101,6 @@
 #define MYNEWT_VAL_BLE_MESH_LOW_POWER_LOG_MOD (15)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_LPN_AUTO
 #define MYNEWT_VAL_BLE_MESH_LPN_AUTO (0)
 #endif
@@ -1181,7 +1157,6 @@
 #define MYNEWT_VAL_BLE_MESH_MODEL_EXTENSIONS (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_MODEL_GROUP_COUNT
 #define MYNEWT_VAL_BLE_MESH_MODEL_GROUP_COUNT (2)
 #endif
@@ -1198,7 +1173,6 @@
 #define MYNEWT_VAL_BLE_MESH_MODEL_LOG_MOD (16)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_MODEL_VND_MSG_CID_FORCE
 #define MYNEWT_VAL_BLE_MESH_MODEL_VND_MSG_CID_FORCE (1)
 #endif
@@ -1255,7 +1229,6 @@
 #define MYNEWT_VAL_BLE_MESH_OOB_OUTPUT_SIZE (4)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_PB_ADV
 #define MYNEWT_VAL_BLE_MESH_PB_ADV (1)
 #endif
@@ -1264,7 +1237,6 @@
 #define MYNEWT_VAL_BLE_MESH_PB_ADV_RETRANS_TIMEOUT (500)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_PB_GATT
 #define MYNEWT_VAL_BLE_MESH_PB_GATT (1)
 #endif
@@ -1273,7 +1245,6 @@
 #define MYNEWT_VAL_BLE_MESH_PB_GATT_USE_DEVICE_NAME (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_PROV
 #define MYNEWT_VAL_BLE_MESH_PROV (1)
 #endif
@@ -1314,7 +1285,6 @@
 #define MYNEWT_VAL_BLE_MESH_PROV_OOB_PUBLIC_KEY (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/nimble/host/mesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_PROXY
 #define MYNEWT_VAL_BLE_MESH_PROXY (1)
 #endif
@@ -1331,21 +1301,18 @@
 #define MYNEWT_VAL_BLE_MESH_PROXY_LOG_MOD (19)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/nimble/host/mesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN
-#define MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN (33)
+#define MYNEWT_VAL_BLE_MESH_PROXY_MSG_LEN (66)
 #endif
 
 #ifndef MYNEWT_VAL_BLE_MESH_PROXY_USE_DEVICE_NAME
 #define MYNEWT_VAL_BLE_MESH_PROXY_USE_DEVICE_NAME (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_RELAY
 #define MYNEWT_VAL_BLE_MESH_RELAY (1)
 #endif
 
-/* Value copied from BLE_MESH_RELAY */
 #ifndef MYNEWT_VAL_BLE_MESH_RELAY_ENABLED
 #define MYNEWT_VAL_BLE_MESH_RELAY_ENABLED (1)
 #endif
@@ -1390,7 +1357,6 @@
 #define MYNEWT_VAL_BLE_MESH_SEQ_STORE_RATE (128)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_SETTINGS
 #define MYNEWT_VAL_BLE_MESH_SETTINGS (0)
 #endif
@@ -1403,7 +1369,6 @@
 #define MYNEWT_VAL_BLE_MESH_SETTINGS_LOG_MOD (20)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_SHELL
 #define MYNEWT_VAL_BLE_MESH_SHELL (0)
 #endif
@@ -1416,7 +1381,6 @@
 #define MYNEWT_VAL_BLE_MESH_STORE_TIMEOUT (2)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_SUBNET_COUNT
 #define MYNEWT_VAL_BLE_MESH_SUBNET_COUNT (2)
 #endif
@@ -1429,7 +1393,6 @@
 #define MYNEWT_VAL_BLE_MESH_SYSINIT_STAGE_SHELL (1000)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_TESTING
 #define MYNEWT_VAL_BLE_MESH_TESTING (1)
 #endif
@@ -1442,7 +1405,6 @@
 #define MYNEWT_VAL_BLE_MESH_TRANS_LOG_MOD (21)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/host/mesh) */
 #ifndef MYNEWT_VAL_BLE_MESH_TX_SEG_MAX
 #define MYNEWT_VAL_BLE_MESH_TX_SEG_MAX (6)
 #endif
@@ -1467,7 +1429,6 @@
 #define MYNEWT_VAL_BLE_MESH_UNPROV_BEACON_INT (5)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ans */
 #ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
 #define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
 #endif
@@ -1480,7 +1441,6 @@
 #define MYNEWT_VAL_BLE_SVC_ANS_UNR_ALERT_CAT (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/bas */
 #ifndef MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE
 #define MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE (1)
 #endif
@@ -1493,7 +1453,6 @@
 #define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/dis */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM (-1)
 #endif
@@ -1502,7 +1461,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM (-1)
 #endif
@@ -1511,7 +1469,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM (-1)
 #endif
@@ -1520,7 +1477,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM (-1)
 #endif
@@ -1537,7 +1493,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM (-1)
 #endif
@@ -1546,7 +1501,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM (-1)
 #endif
@@ -1559,12 +1513,10 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM (-1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gap */
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #endif
@@ -1609,32 +1561,26 @@
 #define MYNEWT_VAL_BLE_SVC_GAP_SYSINIT_STAGE (301)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gatt */
 #ifndef MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ias */
 #ifndef MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ipss */
 #ifndef MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/lls */
 #ifndef MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/tps */
 #ifndef MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
 #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
 
 #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
@@ -1693,12 +1639,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT (10)
 #endif
@@ -1748,12 +1692,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
 #endif
@@ -1762,7 +1704,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
 #define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
 #endif
@@ -1791,7 +1732,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport/socket */
 #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500)
 #endif
@@ -1800,12 +1740,10 @@
 #define MYNEWT_VAL_BLE_SOCK_LINUX_DEV (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_STACK_SIZE
 #define MYNEWT_VAL_BLE_SOCK_STACK_SIZE (1028)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_TASK_PRIO
 #define MYNEWT_VAL_BLE_SOCK_TASK_PRIO (3)
 #endif
@@ -1814,7 +1752,6 @@
 #define MYNEWT_VAL_BLE_SOCK_TCP_PORT (14433)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE
 #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1)
 #endif
@@ -1823,12 +1760,10 @@
 #define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/linux_blemesh (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP
 #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0)
 #endif
 
-/*** newt */
 #ifndef MYNEWT_VAL_APP_NAME
 #define MYNEWT_VAL_APP_NAME "dummy_app"
 #endif
@@ -1869,7 +1804,6 @@
 #define MYNEWT_VAL_TARGET_linux_blemesh (1)
 #endif
 
-/*** Included packages */
 #define MYNEWT_PKG_apache_mynewt_core__compiler_sim 1
 #define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_native 1
@@ -1915,7 +1849,6 @@
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_linux_blemesh 1
 
-/*** Included APIs */
 #define MYNEWT_API_TRNG_HW_IMPL 1
 #define MYNEWT_API_ble_transport 1
 #define MYNEWT_API_console 1
diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h
index 4740c348..c116f586 100644
--- a/porting/examples/nuttx/include/syscfg/syscfg.h
+++ b/porting/examples/nuttx/include/syscfg/syscfg.h
@@ -1,21 +1,28 @@
-/**
- * This file was generated by Apache newt version: 1.12.0
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef H_MYNEWT_SYSCFG_
 #define H_MYNEWT_SYSCFG_
 
-/**
- * This macro exists to ensure code includes this header when needed.  If code
- * checks the existence of a setting directly via ifdef without including this
- * header, the setting macro will silently evaluate to 0.  In contrast, an
- * attempt to use these macros without including this header will result in a
- * compiler error.
- */
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
 
-/*** @apache-mynewt-core/crypto/tinycrypt */
 #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE
 #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200)
 #endif
@@ -28,12 +35,10 @@
 #define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0)
 #endif
 
-/*** @apache-mynewt-core/hw/bsp/native */
 #ifndef MYNEWT_VAL_BSP_SIMULATED
 #define MYNEWT_VAL_BSP_SIMULATED (1)
 #endif
 
-/*** @apache-mynewt-core/hw/hal */
 #ifndef MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS
 #define MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS (1)
 #endif
@@ -62,7 +67,6 @@
 #define MYNEWT_VAL_HAL_SYSTEM_RESET_CB (0)
 #endif
 
-/*** @apache-mynewt-core/hw/mcu/native */
 #ifndef MYNEWT_VAL_I2C_0
 #define MYNEWT_VAL_I2C_0 (0)
 #endif
@@ -95,7 +99,6 @@
 #define MYNEWT_VAL_MCU_UART_POLLER_PRIO (1)
 #endif
 
-/*** @apache-mynewt-core/kernel/os */
 #ifndef MYNEWT_VAL_FLOAT_USER
 #define MYNEWT_VAL_FLOAT_USER (0)
 #endif
@@ -152,7 +155,6 @@
 #define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CRASH_FILE_LINE
 #define MYNEWT_VAL_OS_CRASH_FILE_LINE (1)
 #endif
@@ -197,7 +199,6 @@
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MAX (600000)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN (1)
 #endif
@@ -266,7 +267,6 @@
 #define MYNEWT_VAL_OS_TASK_RUN_TIME_CPUTIME (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_TICKS_PER_SEC
 #define MYNEWT_VAL_OS_TICKS_PER_SEC (100)
 #endif
@@ -287,7 +287,6 @@
 #define MYNEWT_VAL_WATCHDOG_INTERVAL (30000)
 #endif
 
-/*** @apache-mynewt-core/net/ip/native_sockets */
 #ifndef MYNEWT_VAL_NATIVE_SOCKETS_MAX
 #define MYNEWT_VAL_NATIVE_SOCKETS_MAX (8)
 #endif
@@ -314,7 +313,6 @@
 #define MYNEWT_VAL_NATIVE_SOCKETS_SYSINIT_STAGE (200)
 #endif
 
-/*** @apache-mynewt-core/sys/console/stub */
 #ifndef MYNEWT_VAL_CONSOLE_UART_BAUD
 #define MYNEWT_VAL_CONSOLE_UART_BAUD (115200)
 #endif
@@ -327,7 +325,6 @@
 #define MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL (UART_FLOW_CTL_NONE)
 #endif
 
-/*** @apache-mynewt-core/sys/flash_map */
 #ifndef MYNEWT_VAL_FLASH_MAP_MAX_AREAS
 #define MYNEWT_VAL_FLASH_MAP_MAX_AREAS (10)
 #endif
@@ -340,7 +337,6 @@
 #define MYNEWT_VAL_FLASH_MAP_SYSINIT_STAGE (9)
 #endif
 
-/*** @apache-mynewt-core/sys/log/common */
 #ifndef MYNEWT_VAL_DFLT_LOG_LVL
 #define MYNEWT_VAL_DFLT_LOG_LVL (1)
 #endif
@@ -353,7 +349,6 @@
 #define MYNEWT_VAL_LOG_GLOBAL_IDX (1)
 #endif
 
-/*** @apache-mynewt-core/sys/log/modlog */
 #ifndef MYNEWT_VAL_MODLOG_CONSOLE_DFLT
 #define MYNEWT_VAL_MODLOG_CONSOLE_DFLT (1)
 #endif
@@ -374,7 +369,6 @@
 #define MYNEWT_VAL_MODLOG_SYSINIT_STAGE (100)
 #endif
 
-/*** @apache-mynewt-core/sys/log/stub */
 #ifndef MYNEWT_VAL_LOG_CONSOLE
 #define MYNEWT_VAL_LOG_CONSOLE (1)
 #endif
@@ -387,17 +381,14 @@
 #define MYNEWT_VAL_LOG_FCB_SLOT1 (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-core/sys/log/stub) */
 #ifndef MYNEWT_VAL_LOG_LEVEL
 #define MYNEWT_VAL_LOG_LEVEL (2)
 #endif
 
-/*** @apache-mynewt-core/sys/sys */
 #ifndef MYNEWT_VAL_DEBUG_PANIC_ENABLED
 #define MYNEWT_VAL_DEBUG_PANIC_ENABLED (1)
 #endif
 
-/*** @apache-mynewt-core/sys/sysdown */
 #ifndef MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN
 #define MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN (1)
 #endif
@@ -414,27 +405,26 @@
 #define MYNEWT_VAL_SYSDOWN_TIMEOUT_MS (10000)
 #endif
 
-/*** @apache-mynewt-core/sys/sysinit */
 #ifndef MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT
 #define MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE
 #define MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_MESSAGE
 #define MYNEWT_VAL_SYSINIT_PANIC_MESSAGE (1)
 #endif
 
-/*** @apache-mynewt-core/util/rwlock */
 #ifndef MYNEWT_VAL_RWLOCK_DEBUG
 #define MYNEWT_VAL_RWLOCK_DEBUG (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble */
+#ifndef MYNEWT_VAL_BLE_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_CONN_SUBRATING
 #define MYNEWT_VAL_BLE_CONN_SUBRATING (0)
 #endif
@@ -531,7 +521,6 @@
 #define MYNEWT_VAL_BLE_WHITELIST (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
 #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
 #endif
@@ -844,7 +833,6 @@
 #define MYNEWT_VAL_BLE_SM_KEYPRESS (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_SM_LEGACY
 #define MYNEWT_VAL_BLE_SM_LEGACY (1)
 #endif
@@ -869,7 +857,6 @@
 #define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_SM_SC
 #define MYNEWT_VAL_BLE_SM_SC (1)
 #endif
@@ -894,7 +881,6 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ans */
 #ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
 #define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
 #endif
@@ -907,7 +893,6 @@
 #define MYNEWT_VAL_BLE_SVC_ANS_UNR_ALERT_CAT (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/bas */
 #ifndef MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE
 #define MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE (1)
 #endif
@@ -920,7 +905,6 @@
 #define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/dis */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM (-1)
 #endif
@@ -929,7 +913,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM (-1)
 #endif
@@ -938,7 +921,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM (-1)
 #endif
@@ -947,7 +929,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM (-1)
 #endif
@@ -964,7 +945,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM (-1)
 #endif
@@ -973,7 +953,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM (-1)
 #endif
@@ -986,12 +965,10 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM (-1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gap */
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #endif
@@ -1036,32 +1013,26 @@
 #define MYNEWT_VAL_BLE_SVC_GAP_SYSINIT_STAGE (301)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gatt */
 #ifndef MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ias */
 #ifndef MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ipss */
 #ifndef MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/lls */
 #ifndef MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/tps */
 #ifndef MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
 #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
 
 #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
@@ -1120,12 +1091,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT (10)
 #endif
@@ -1175,12 +1144,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
 #endif
@@ -1189,7 +1156,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
 #define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
 #endif
@@ -1218,7 +1184,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport/socket */
 #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500)
 #endif
@@ -1227,12 +1192,10 @@
 #define MYNEWT_VAL_BLE_SOCK_LINUX_DEV (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_STACK_SIZE
 #define MYNEWT_VAL_BLE_SOCK_STACK_SIZE (1028)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_TASK_PRIO
 #define MYNEWT_VAL_BLE_SOCK_TASK_PRIO (3)
 #endif
@@ -1245,17 +1208,14 @@
 #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_NUTTX
 #define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/nuttx (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP
 #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0)
 #endif
 
-/*** newt */
 #ifndef MYNEWT_VAL_APP_NAME
 #define MYNEWT_VAL_APP_NAME "dummy_app"
 #endif
@@ -1296,7 +1256,6 @@
 #define MYNEWT_VAL_TARGET_nuttx (1)
 #endif
 
-/*** Included packages */
 #define MYNEWT_PKG_apache_mynewt_core__compiler_sim 1
 #define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_native 1
@@ -1341,7 +1300,6 @@
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_nuttx 1
 
-/*** Included APIs */
 #define MYNEWT_API_TRNG_HW_IMPL 1
 #define MYNEWT_API_ble_transport 1
 #define MYNEWT_API_console 1
diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h
index 766a5e46..926b7756 100644
--- a/porting/nimble/include/syscfg/syscfg.h
+++ b/porting/nimble/include/syscfg/syscfg.h
@@ -1,21 +1,28 @@
-/**
- * This file was generated by Apache newt version: 1.12.0
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef H_MYNEWT_SYSCFG_
 #define H_MYNEWT_SYSCFG_
 
-/**
- * This macro exists to ensure code includes this header when needed.  If code
- * checks the existence of a setting directly via ifdef without including this
- * header, the setting macro will silently evaluate to 0.  In contrast, an
- * attempt to use these macros without including this header will result in a
- * compiler error.
- */
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
 
-/*** @apache-mynewt-core/crypto/tinycrypt */
 #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE
 #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200)
 #endif
@@ -28,12 +35,10 @@
 #define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0)
 #endif
 
-/*** @apache-mynewt-core/hw/bsp/native */
 #ifndef MYNEWT_VAL_BSP_SIMULATED
 #define MYNEWT_VAL_BSP_SIMULATED (1)
 #endif
 
-/*** @apache-mynewt-core/hw/hal */
 #ifndef MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS
 #define MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS (1)
 #endif
@@ -62,7 +67,6 @@
 #define MYNEWT_VAL_HAL_SYSTEM_RESET_CB (0)
 #endif
 
-/*** @apache-mynewt-core/hw/mcu/native */
 #ifndef MYNEWT_VAL_I2C_0
 #define MYNEWT_VAL_I2C_0 (0)
 #endif
@@ -95,7 +99,6 @@
 #define MYNEWT_VAL_MCU_UART_POLLER_PRIO (1)
 #endif
 
-/*** @apache-mynewt-core/kernel/os */
 #ifndef MYNEWT_VAL_FLOAT_USER
 #define MYNEWT_VAL_FLOAT_USER (0)
 #endif
@@ -152,7 +155,6 @@
 #define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CRASH_FILE_LINE
 #define MYNEWT_VAL_OS_CRASH_FILE_LINE (1)
 #endif
@@ -197,7 +199,6 @@
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MAX (600000)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN
 #define MYNEWT_VAL_OS_IDLE_TICKLESS_MS_MIN (1)
 #endif
@@ -266,7 +267,6 @@
 #define MYNEWT_VAL_OS_TASK_RUN_TIME_CPUTIME (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/native (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_TICKS_PER_SEC
 #define MYNEWT_VAL_OS_TICKS_PER_SEC (100)
 #endif
@@ -287,7 +287,6 @@
 #define MYNEWT_VAL_WATCHDOG_INTERVAL (30000)
 #endif
 
-/*** @apache-mynewt-core/net/ip/native_sockets */
 #ifndef MYNEWT_VAL_NATIVE_SOCKETS_MAX
 #define MYNEWT_VAL_NATIVE_SOCKETS_MAX (8)
 #endif
@@ -314,7 +313,6 @@
 #define MYNEWT_VAL_NATIVE_SOCKETS_SYSINIT_STAGE (200)
 #endif
 
-/*** @apache-mynewt-core/sys/console/stub */
 #ifndef MYNEWT_VAL_CONSOLE_UART_BAUD
 #define MYNEWT_VAL_CONSOLE_UART_BAUD (115200)
 #endif
@@ -327,7 +325,6 @@
 #define MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL (UART_FLOW_CTL_NONE)
 #endif
 
-/*** @apache-mynewt-core/sys/flash_map */
 #ifndef MYNEWT_VAL_FLASH_MAP_MAX_AREAS
 #define MYNEWT_VAL_FLASH_MAP_MAX_AREAS (10)
 #endif
@@ -340,7 +337,6 @@
 #define MYNEWT_VAL_FLASH_MAP_SYSINIT_STAGE (9)
 #endif
 
-/*** @apache-mynewt-core/sys/log/common */
 #ifndef MYNEWT_VAL_DFLT_LOG_LVL
 #define MYNEWT_VAL_DFLT_LOG_LVL (1)
 #endif
@@ -353,7 +349,6 @@
 #define MYNEWT_VAL_LOG_GLOBAL_IDX (1)
 #endif
 
-/*** @apache-mynewt-core/sys/log/modlog */
 #ifndef MYNEWT_VAL_MODLOG_CONSOLE_DFLT
 #define MYNEWT_VAL_MODLOG_CONSOLE_DFLT (1)
 #endif
@@ -374,7 +369,6 @@
 #define MYNEWT_VAL_MODLOG_SYSINIT_STAGE (100)
 #endif
 
-/*** @apache-mynewt-core/sys/log/stub */
 #ifndef MYNEWT_VAL_LOG_CONSOLE
 #define MYNEWT_VAL_LOG_CONSOLE (1)
 #endif
@@ -391,12 +385,10 @@
 #define MYNEWT_VAL_LOG_LEVEL (255)
 #endif
 
-/*** @apache-mynewt-core/sys/sys */
 #ifndef MYNEWT_VAL_DEBUG_PANIC_ENABLED
 #define MYNEWT_VAL_DEBUG_PANIC_ENABLED (1)
 #endif
 
-/*** @apache-mynewt-core/sys/sysdown */
 #ifndef MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN
 #define MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN (1)
 #endif
@@ -413,27 +405,26 @@
 #define MYNEWT_VAL_SYSDOWN_TIMEOUT_MS (10000)
 #endif
 
-/*** @apache-mynewt-core/sys/sysinit */
 #ifndef MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT
 #define MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE
 #define MYNEWT_VAL_SYSINIT_PANIC_FILE_LINE (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/native (defined by @apache-mynewt-core/sys/sysinit) */
 #ifndef MYNEWT_VAL_SYSINIT_PANIC_MESSAGE
 #define MYNEWT_VAL_SYSINIT_PANIC_MESSAGE (1)
 #endif
 
-/*** @apache-mynewt-core/util/rwlock */
 #ifndef MYNEWT_VAL_RWLOCK_DEBUG
 #define MYNEWT_VAL_RWLOCK_DEBUG (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble */
+#ifndef MYNEWT_VAL_BLE_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_CONN_SUBRATING
 #define MYNEWT_VAL_BLE_CONN_SUBRATING (0)
 #endif
@@ -530,7 +521,6 @@
 #define MYNEWT_VAL_BLE_WHITELIST (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
 #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
 #endif
@@ -891,7 +881,6 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ans */
 #ifndef MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT
 #define MYNEWT_VAL_BLE_SVC_ANS_NEW_ALERT_CAT (0)
 #endif
@@ -904,7 +893,6 @@
 #define MYNEWT_VAL_BLE_SVC_ANS_UNR_ALERT_CAT (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/bas */
 #ifndef MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE
 #define MYNEWT_VAL_BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE (1)
 #endif
@@ -917,7 +905,6 @@
 #define MYNEWT_VAL_BLE_SVC_BAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/dis */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_DEFAULT_READ_PERM (-1)
 #endif
@@ -926,7 +913,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM (-1)
 #endif
@@ -935,7 +921,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM (-1)
 #endif
@@ -944,7 +929,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM (-1)
 #endif
@@ -961,7 +945,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM (-1)
 #endif
@@ -970,7 +953,6 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM (-1)
 #endif
@@ -983,12 +965,10 @@
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_DEFAULT (NULL)
 #endif
 
-/* Value copied from BLE_SVC_DIS_DEFAULT_READ_PERM */
 #ifndef MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM
 #define MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_READ_PERM (-1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gap */
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #endif
@@ -1033,32 +1013,26 @@
 #define MYNEWT_VAL_BLE_SVC_GAP_SYSINIT_STAGE (301)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gatt */
 #ifndef MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ias */
 #ifndef MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IAS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/ipss */
 #ifndef MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_IPSS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/lls */
 #ifndef MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_LLS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/tps */
 #ifndef MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_TPS_SYSINIT_STAGE (303)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
 #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
 
 #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
@@ -1117,12 +1091,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT (10)
 #endif
@@ -1172,12 +1144,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
 #endif
@@ -1186,7 +1156,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_SIZE (300)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3
 #define MYNEWT_VAL_BLE_TRANSPORT_LL__apollo3 (0)
 #endif
@@ -1215,7 +1184,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport/socket */
 #ifndef MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SOCK_CLI_SYSINIT_STAGE (500)
 #endif
@@ -1236,7 +1204,6 @@
 #define MYNEWT_VAL_BLE_SOCK_TCP_PORT (14433)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE
 #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1)
 #endif
@@ -1245,12 +1212,10 @@
 #define MYNEWT_VAL_BLE_SOCK_USE_NUTTX (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/porting_default (defined by @apache-mynewt-nimble/nimble/transport/socket) */
 #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP
 #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0)
 #endif
 
-/*** newt */
 #ifndef MYNEWT_VAL_APP_NAME
 #define MYNEWT_VAL_APP_NAME "dummy_app"
 #endif
@@ -1291,7 +1256,6 @@
 #define MYNEWT_VAL_TARGET_porting_default (1)
 #endif
 
-/*** Included packages */
 #define MYNEWT_PKG_apache_mynewt_core__compiler_sim 1
 #define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_native 1
@@ -1336,7 +1300,6 @@
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_porting_default 1
 
-/*** Included APIs */
 #define MYNEWT_API_TRNG_HW_IMPL 1
 #define MYNEWT_API_ble_transport 1
 #define MYNEWT_API_console 1
diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h
index d07ca8a1..06080e27 100644
--- a/porting/npl/riot/include/syscfg/syscfg.h
+++ b/porting/npl/riot/include/syscfg/syscfg.h
@@ -1,26 +1,310 @@
-/**
- * This file was generated by Apache newt version: 1.12.0
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 #ifndef H_MYNEWT_SYSCFG_
 #define H_MYNEWT_SYSCFG_
 
-/**
- * This macro exists to ensure code includes this header when needed.  If code
- * checks the existence of a setting directly via ifdef without including this
- * header, the setting macro will silently evaluate to 0.  In contrast, an
- * attempt to use these macros without including this header will result in a
- * compiler error.
- */
 #define MYNEWT_VAL(_name)                       MYNEWT_VAL_ ## _name
 #define MYNEWT_VAL_CHOICE(_name, _val)          MYNEWT_VAL_ ## _name ## __ ## _val
 
-/*** @apache-mynewt-core/compiler/arm-none-eabi-m4 */
+#ifndef MYNEWT_VAL_INCLUDE_IMAGE_HEADER
+#define MYNEWT_VAL_INCLUDE_IMAGE_HEADER (1)
+#endif
+
+#undef MYNEWT_VAL_LINK_TEMPLATE
+
+#ifndef MYNEWT_VAL_MAIN_STACK_SIZE
+#define MYNEWT_VAL_MAIN_STACK_SIZE (768)
+#endif
+
+#ifndef MYNEWT_VAL_MCU_RAM_SIZE
+#define MYNEWT_VAL_MCU_RAM_SIZE (0x40000)
+#endif
+
+#ifndef MYNEWT_VAL_MCU_RAM_START
+#define MYNEWT_VAL_MCU_RAM_START (0x20000000)
+#endif
+
 #ifndef MYNEWT_VAL_HARDFLOAT
 #define MYNEWT_VAL_HARDFLOAT (0)
 #endif
 
-/*** @apache-mynewt-core/crypto/tinycrypt */
+#ifndef MYNEWT_VAL_MBEDTLS_AES_ALT
+#define MYNEWT_VAL_MBEDTLS_AES_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_AES_C
+#define MYNEWT_VAL_MBEDTLS_AES_C (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_AES_FEWER_TABLES
+#define MYNEWT_VAL_MBEDTLS_AES_FEWER_TABLES (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_AES_ROM_TABLES
+#define MYNEWT_VAL_MBEDTLS_AES_ROM_TABLES (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ARC4_C
+#define MYNEWT_VAL_MBEDTLS_ARC4_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ARIA_C
+#define MYNEWT_VAL_MBEDTLS_ARIA_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_BASE64_C
+#define MYNEWT_VAL_MBEDTLS_BASE64_C (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_BIGNUM_ALT
+#define MYNEWT_VAL_MBEDTLS_BIGNUM_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_BLOWFISH_C
+#define MYNEWT_VAL_MBEDTLS_BLOWFISH_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CAMELLIA_C
+#define MYNEWT_VAL_MBEDTLS_CAMELLIA_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CCM_C
+#define MYNEWT_VAL_MBEDTLS_CCM_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CHACHA20_C
+#define MYNEWT_VAL_MBEDTLS_CHACHA20_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CHACHAPOLY_C
+#define MYNEWT_VAL_MBEDTLS_CHACHAPOLY_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CBC
+#define MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CBC (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CFB
+#define MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CFB (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CTR
+#define MYNEWT_VAL_MBEDTLS_CIPHER_MODE_CTR (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CIPHER_MODE_OFB
+#define MYNEWT_VAL_MBEDTLS_CIPHER_MODE_OFB (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CIPHER_MODE_XTS
+#define MYNEWT_VAL_MBEDTLS_CIPHER_MODE_XTS (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CMAC_C
+#define MYNEWT_VAL_MBEDTLS_CMAC_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_CTR_DRBG_C
+#define MYNEWT_VAL_MBEDTLS_CTR_DRBG_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_DES_C
+#define MYNEWT_VAL_MBEDTLS_DES_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECDH_COMPUTE_SHARED_ALT
+#define MYNEWT_VAL_MBEDTLS_ECDH_COMPUTE_SHARED_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECDH_GEN_PUBLIC_ALT
+#define MYNEWT_VAL_MBEDTLS_ECDH_GEN_PUBLIC_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECDSA_GENKEY_ALT
+#define MYNEWT_VAL_MBEDTLS_ECDSA_GENKEY_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECDSA_SIGN_ALT
+#define MYNEWT_VAL_MBEDTLS_ECDSA_SIGN_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECDSA_VERIFY_ALT
+#define MYNEWT_VAL_MBEDTLS_ECDSA_VERIFY_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECJPAKE_C
+#define MYNEWT_VAL_MBEDTLS_ECJPAKE_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_ALT
+#define MYNEWT_VAL_MBEDTLS_ECP_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_BP256R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_BP256R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_BP384R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_BP384R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_BP512R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_BP512R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_CURVE25519
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_CURVE25519 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_CURVE448
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_CURVE448 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP192K1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP192K1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP192R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP192R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP224K1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP224K1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP224R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP224R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP256K1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP256K1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP256R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP256R1 (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP384R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP384R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_DP_SECP521R1
+#define MYNEWT_VAL_MBEDTLS_ECP_DP_SECP521R1 (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ECP_RESTARTABLE
+#define MYNEWT_VAL_MBEDTLS_ECP_RESTARTABLE (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ENTROPY_C
+#define MYNEWT_VAL_MBEDTLS_ENTROPY_C (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_ENTROPY_HARDWARE_ALT
+#define MYNEWT_VAL_MBEDTLS_ENTROPY_HARDWARE_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_GENPRIME
+#define MYNEWT_VAL_MBEDTLS_GENPRIME (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_HKDF_C
+#define MYNEWT_VAL_MBEDTLS_HKDF_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+#define MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#define MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+#define MYNEWT_VAL_MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_MD2_C
+#define MYNEWT_VAL_MBEDTLS_MD2_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_MD4_C
+#define MYNEWT_VAL_MBEDTLS_MD4_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_MD5_C
+#define MYNEWT_VAL_MBEDTLS_MD5_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_MPI_MAX_SIZE
+#define MYNEWT_VAL_MBEDTLS_MPI_MAX_SIZE (1024)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_NIST_KW_C
+#define MYNEWT_VAL_MBEDTLS_NIST_KW_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_PKCS1_V15
+#define MYNEWT_VAL_MBEDTLS_PKCS1_V15 (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_PKCS1_V21
+#define MYNEWT_VAL_MBEDTLS_PKCS1_V21 (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_POLY1305_C
+#define MYNEWT_VAL_MBEDTLS_POLY1305_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_RIPEMD160_C
+#define MYNEWT_VAL_MBEDTLS_RIPEMD160_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_SHA1_C
+#define MYNEWT_VAL_MBEDTLS_SHA1_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_SHA256_ALT
+#define MYNEWT_VAL_MBEDTLS_SHA256_ALT (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_SHA256_C
+#define MYNEWT_VAL_MBEDTLS_SHA256_C (1)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_SHA512_C
+#define MYNEWT_VAL_MBEDTLS_SHA512_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_SSL_TLS_C
+#define MYNEWT_VAL_MBEDTLS_SSL_TLS_C (0)
+#endif
+
+#ifndef MYNEWT_VAL_MBEDTLS_TIMING_C
+#define MYNEWT_VAL_MBEDTLS_TIMING_C (0)
+#endif
+
 #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE
 #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200)
 #endif
@@ -33,7 +317,6 @@
 #define MYNEWT_VAL_TINYCRYPT_UECC_RNG_USE_TRNG (0)
 #endif
 
-/*** @apache-mynewt-core/hw/bsp/nordic_pca10056 */
 #ifndef MYNEWT_VAL_BSP_NRF52840
 #define MYNEWT_VAL_BSP_NRF52840 (1)
 #endif
@@ -42,7 +325,6 @@
 #define MYNEWT_VAL_SOFT_PWM (0)
 #endif
 
-/*** @apache-mynewt-core/hw/hal */
 #ifndef MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS
 #define MYNEWT_VAL_HAL_ENABLE_SOFTWARE_BREAKPOINTS (1)
 #endif
@@ -71,7 +353,6 @@
 #define MYNEWT_VAL_HAL_SYSTEM_RESET_CB (0)
 #endif
 
-/*** @apache-mynewt-core/hw/mcu/nordic/nrf52xxx */
 #ifndef MYNEWT_VAL_ADC_0
 #define MYNEWT_VAL_ADC_0 (0)
 #endif
@@ -84,7 +365,6 @@
 #define MYNEWT_VAL_CRYPTO (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_GPIO_AS_PIN_RESET
 #define MYNEWT_VAL_GPIO_AS_PIN_RESET (1)
 #endif
@@ -97,12 +377,10 @@
 #define MYNEWT_VAL_I2C_0_FREQ_KHZ (100)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_I2C_0_PIN_SCL
 #define MYNEWT_VAL_I2C_0_PIN_SCL (27)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_I2C_0_PIN_SDA
 #define MYNEWT_VAL_I2C_0_PIN_SDA (26)
 #endif
@@ -119,7 +397,6 @@
 
 #undef MYNEWT_VAL_I2C_1_PIN_SDA
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_ACCESS_PORT_PROTECTION__default
 #define MYNEWT_VAL_MCU_ACCESS_PORT_PROTECTION__default (0)
 #endif
@@ -137,12 +414,10 @@
 #define MYNEWT_VAL_MCU_BUS_DRIVER_I2C_USE_TWIM (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_COMMON_STARTUP
 #define MYNEWT_VAL_MCU_COMMON_STARTUP (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_DCDC_ENABLED
 #define MYNEWT_VAL_MCU_DCDC_ENABLED (1)
 #endif
@@ -173,12 +448,10 @@
 #define MYNEWT_VAL_MCU_I2C_RECOVERY_DELAY_USEC (100)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_ICACHE_ENABLED
 #define MYNEWT_VAL_MCU_ICACHE_ENABLED (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_LFCLK_SOURCE__LFRC
 #define MYNEWT_VAL_MCU_LFCLK_SOURCE__LFRC (0)
 #endif
@@ -200,7 +473,6 @@
 #define MYNEWT_VAL_MCU_NRF52840 (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_MCU_TARGET__nRF52810
 #define MYNEWT_VAL_MCU_TARGET__nRF52810 (0)
 #endif
@@ -249,47 +521,38 @@
 #define MYNEWT_VAL_QSPI_ENABLE (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_FLASH_PAGE_SIZE
 #define MYNEWT_VAL_QSPI_FLASH_PAGE_SIZE (256)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_FLASH_SECTOR_COUNT
 #define MYNEWT_VAL_QSPI_FLASH_SECTOR_COUNT (4096)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_FLASH_SECTOR_SIZE
 #define MYNEWT_VAL_QSPI_FLASH_SECTOR_SIZE (4096)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_CS
 #define MYNEWT_VAL_QSPI_PIN_CS (17)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_DIO0
 #define MYNEWT_VAL_QSPI_PIN_DIO0 (20)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_DIO1
 #define MYNEWT_VAL_QSPI_PIN_DIO1 (21)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_DIO2
 #define MYNEWT_VAL_QSPI_PIN_DIO2 (22)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_DIO3
 #define MYNEWT_VAL_QSPI_PIN_DIO3 (23)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_QSPI_PIN_SCK
 #define MYNEWT_VAL_QSPI_PIN_SCK (19)
 #endif
@@ -318,17 +581,14 @@
 #define MYNEWT_VAL_SPI_0_MASTER (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_MASTER_PIN_MISO
 #define MYNEWT_VAL_SPI_0_MASTER_PIN_MISO (46)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_MASTER_PIN_MOSI
 #define MYNEWT_VAL_SPI_0_MASTER_PIN_MOSI (45)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_MASTER_PIN_SCK
 #define MYNEWT_VAL_SPI_0_MASTER_PIN_SCK (47)
 #endif
@@ -337,22 +597,18 @@
 #define MYNEWT_VAL_SPI_0_SLAVE (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_SLAVE_PIN_MISO
 #define MYNEWT_VAL_SPI_0_SLAVE_PIN_MISO (46)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_SLAVE_PIN_MOSI
 #define MYNEWT_VAL_SPI_0_SLAVE_PIN_MOSI (45)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_SLAVE_PIN_SCK
 #define MYNEWT_VAL_SPI_0_SLAVE_PIN_SCK (47)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_SPI_0_SLAVE_PIN_SS
 #define MYNEWT_VAL_SPI_0_SLAVE_PIN_SS (44)
 #endif
@@ -415,7 +671,6 @@
 #define MYNEWT_VAL_TEMP (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_TIMER_0
 #define MYNEWT_VAL_TIMER_0 (0)
 #endif
@@ -436,7 +691,6 @@
 #define MYNEWT_VAL_TIMER_4 (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_TIMER_5
 #define MYNEWT_VAL_TIMER_5 (1)
 #endif
@@ -449,22 +703,18 @@
 #define MYNEWT_VAL_UART_0 (1)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_UART_0_PIN_CTS
 #define MYNEWT_VAL_UART_0_PIN_CTS (7)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_UART_0_PIN_RTS
 #define MYNEWT_VAL_UART_0_PIN_RTS (5)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_UART_0_PIN_RX
 #define MYNEWT_VAL_UART_0_PIN_RX (8)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx) */
 #ifndef MYNEWT_VAL_UART_0_PIN_TX
 #define MYNEWT_VAL_UART_0_PIN_TX (6)
 #endif
@@ -497,17 +747,14 @@
 #define MYNEWT_VAL_XTAL_RC (0)
 #endif
 
-/*** @apache-mynewt-core/kernel/os */
 #ifndef MYNEWT_VAL_FLOAT_USER
 #define MYNEWT_VAL_FLOAT_USER (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT
 #define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (5)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_MSYS_1_BLOCK_SIZE
 #define MYNEWT_VAL_MSYS_1_BLOCK_SIZE (88)
 #endif
@@ -548,12 +795,10 @@
 #define MYNEWT_VAL_OS_COREDUMP_CB (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CPUTIME_FREQ
 #define MYNEWT_VAL_OS_CPUTIME_FREQ (32768)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_CPUTIME_TIMER_NUM
 #define MYNEWT_VAL_OS_CPUTIME_TIMER_NUM (5)
 #endif
@@ -670,7 +915,6 @@
 #define MYNEWT_VAL_OS_TASK_RUN_TIME_CPUTIME (0)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/mcu/nordic/nrf52xxx (defined by @apache-mynewt-core/kernel/os) */
 #ifndef MYNEWT_VAL_OS_TICKS_PER_SEC
 #define MYNEWT_VAL_OS_TICKS_PER_SEC (128)
 #endif
@@ -691,7 +935,6 @@
 #define MYNEWT_VAL_WATCHDOG_INTERVAL (30000)
 #endif
 
-/*** @apache-mynewt-core/libc */
 #ifndef MYNEWT_VAL_LIBC__baselibc
 #define MYNEWT_VAL_LIBC__baselibc (1)
 #endif
@@ -702,7 +945,6 @@
 #define MYNEWT_VAL_LIBC (1)
 #endif
 
-/*** @apache-mynewt-core/libc/baselibc */
 #ifndef MYNEWT_VAL_BASELIBC_ASSERT_FILE_LINE
 #define MYNEWT_VAL_BASELIBC_ASSERT_FILE_LINE (0)
 #endif
@@ -719,7 +961,6 @@
 #define MYNEWT_VAL_BASELIBC_THREAD_SAFE_HEAP_ALLOCATION (0)
 #endif
 
-/*** @apache-mynewt-core/sys/console/stub */
 #ifndef MYNEWT_VAL_CONSOLE_UART_BAUD
 #define MYNEWT_VAL_CONSOLE_UART_BAUD (115200)
 #endif
@@ -732,7 +973,6 @@
 #define MYNEWT_VAL_CONSOLE_UART_FLOW_CONTROL (UART_FLOW_CTL_NONE)
 #endif
 
-/*** @apache-mynewt-core/sys/flash_map */
 #ifndef MYNEWT_VAL_FLASH_MAP_MAX_AREAS
 #define MYNEWT_VAL_FLASH_MAP_MAX_AREAS (10)
 #endif
@@ -745,7 +985,6 @@
 #define MYNEWT_VAL_FLASH_MAP_SYSINIT_STAGE (9)
 #endif
 
-/*** @apache-mynewt-core/sys/log/common */
 #ifndef MYNEWT_VAL_DFLT_LOG_LVL
 #define MYNEWT_VAL_DFLT_LOG_LVL (1)
 #endif
@@ -758,7 +997,6 @@
 #define MYNEWT_VAL_LOG_GLOBAL_IDX (1)
 #endif
 
-/*** @apache-mynewt-core/sys/log/modlog */
 #ifndef MYNEWT_VAL_MODLOG_CONSOLE_DFLT
 #define MYNEWT_VAL_MODLOG_CONSOLE_DFLT (1)
 #endif
@@ -779,7 +1017,6 @@
 #define MYNEWT_VAL_MODLOG_SYSINIT_STAGE (100)
 #endif
 
-/*** @apache-mynewt-core/sys/log/stub */
 #ifndef MYNEWT_VAL_LOG_CONSOLE
 #define MYNEWT_VAL_LOG_CONSOLE (1)
 #endif
@@ -796,12 +1033,10 @@
 #define MYNEWT_VAL_LOG_LEVEL (255)
 #endif
 
-/*** @apache-mynewt-core/sys/sys */
 #ifndef MYNEWT_VAL_DEBUG_PANIC_ENABLED
 #define MYNEWT_VAL_DEBUG_PANIC_ENABLED (1)
 #endif
 
-/*** @apache-mynewt-core/sys/sysdown */
 #ifndef MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN
 #define MYNEWT_VAL_SYSDOWN_CONSTRAIN_DOWN (1)
 #endif
@@ -818,7 +1053,6 @@
 #define MYNEWT_VAL_SYSDOWN_TIMEOUT_MS (10000)
 #endif
 
-/*** @apache-mynewt-core/sys/sysinit */
 #ifndef MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT
 #define MYNEWT_VAL_SYSINIT_CONSTRAIN_INIT (1)
 #endif
@@ -831,12 +1065,14 @@
 #define MYNEWT_VAL_SYSINIT_PANIC_MESSAGE (0)
 #endif
 
-/*** @apache-mynewt-core/util/rwlock */
 #ifndef MYNEWT_VAL_RWLOCK_DEBUG
 #define MYNEWT_VAL_RWLOCK_DEBUG (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble */
+#ifndef MYNEWT_VAL_BLE_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_CONN_SUBRATING
 #define MYNEWT_VAL_BLE_CONN_SUBRATING (0)
 #endif
@@ -849,7 +1085,6 @@
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble) */
 #ifndef MYNEWT_VAL_BLE_HCI_VS
 #define MYNEWT_VAL_BLE_HCI_VS (1)
 #endif
@@ -878,7 +1113,6 @@
 #define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble) */
 #ifndef MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS
 #define MYNEWT_VAL_BLE_MAX_PERIODIC_SYNCS (0)
 #endif
@@ -935,7 +1169,6 @@
 #define MYNEWT_VAL_BLE_WHITELIST (1)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/controller */
 #ifndef MYNEWT_VAL_BLE_CONTROLLER
 #define MYNEWT_VAL_BLE_CONTROLLER (1)
 #endif
@@ -948,7 +1181,6 @@
 #define MYNEWT_VAL_BLE_FEM_ANTENNA (0)
 #endif
 
-/* Value copied from BLE_LL_LNA */
 #ifndef MYNEWT_VAL_BLE_FEM_LNA
 #define MYNEWT_VAL_BLE_FEM_LNA (0)
 #endif
@@ -961,17 +1193,14 @@
 #define MYNEWT_VAL_BLE_FEM_LNA_GAIN_TUNABLE (0)
 #endif
 
-/* Value copied from BLE_LL_LNA_GPIO */
 #ifndef MYNEWT_VAL_BLE_FEM_LNA_GPIO
 #define MYNEWT_VAL_BLE_FEM_LNA_GPIO (-1)
 #endif
 
-/* Value copied from BLE_LL_LNA_TURN_ON_US */
 #ifndef MYNEWT_VAL_BLE_FEM_LNA_TURN_ON_US
 #define MYNEWT_VAL_BLE_FEM_LNA_TURN_ON_US (1)
 #endif
 
-/* Value copied from BLE_LL_PA */
 #ifndef MYNEWT_VAL_BLE_FEM_PA
 #define MYNEWT_VAL_BLE_FEM_PA (0)
 #endif
@@ -984,17 +1213,14 @@
 #define MYNEWT_VAL_BLE_FEM_PA_GAIN_TUNABLE (0)
 #endif
 
-/* Value copied from BLE_LL_PA_GPIO */
 #ifndef MYNEWT_VAL_BLE_FEM_PA_GPIO
 #define MYNEWT_VAL_BLE_FEM_PA_GPIO (-1)
 #endif
 
-/* Value copied from BLE_LL_PA_TURN_ON_US */
 #ifndef MYNEWT_VAL_BLE_FEM_PA_TURN_ON_US
 #define MYNEWT_VAL_BLE_FEM_PA_TURN_ON_US (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE
 #define MYNEWT_VAL_BLE_HW_WHITELIST_ENABLE (0)
 #endif
@@ -1011,27 +1237,22 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_CTRL_TO_HOST_FLOW_CONTROL (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_DATA_LEN_EXT (0)
 #endif
 
-/* Value copied from BLE_PHY_2M */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (0)
 #endif
 
-/* Value copied from BLE_PHY_CODED */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CSA2 (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION (0)
 #endif
@@ -1044,32 +1265,26 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_ENHANCED_CONN_UPDATE (0)
 #endif
 
-/* Value copied from BLE_EXT_ADV */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_EXT_ADV (0)
 #endif
 
-/* Value copied from BLE_PERIODIC_ADV */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV (0)
 #endif
 
-/* Value copied from BLE_MAX_PERIODIC_SYNCS */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT (0)
 #endif
 
-/* Value copied from BLE_MAX_PERIODIC_SYNCS */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT (0)
 #endif
 
-/* Value copied from BLE_PERIODIC_ADV_SYNC_TRANSFER */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_LL_PRIVACY (0)
 #endif
@@ -1086,6 +1301,10 @@
 #define MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_LL_CHANNEL_SOUNDING
+#define MYNEWT_VAL_BLE_LL_CHANNEL_SOUNDING (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_LL_CONN_EVENT_END_MARGIN
 #define MYNEWT_VAL_BLE_LL_CONN_EVENT_END_MARGIN (0)
 #endif
@@ -1094,7 +1313,6 @@
 #define MYNEWT_VAL_BLE_LL_CONN_INIT_AUTO_DLE (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES
 #define MYNEWT_VAL_BLE_LL_CONN_INIT_MAX_TX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE)
 #endif
@@ -1159,7 +1377,6 @@
 #define MYNEWT_VAL_BLE_LL_DIRECT_TEST_MODE (0)
 #endif
 
-/* Value copied from BLE_LL_DIRECT_TEST_MODE */
 #ifndef MYNEWT_VAL_BLE_LL_DTM
 #define MYNEWT_VAL_BLE_LL_DTM (0)
 #endif
@@ -1184,7 +1401,6 @@
 #define MYNEWT_VAL_BLE_LL_HCI_LLCP_TRACE (0)
 #endif
 
-/* Value copied from BLE_HCI_VS */
 #ifndef MYNEWT_VAL_BLE_LL_HCI_VS
 #define MYNEWT_VAL_BLE_LL_HCI_VS (1)
 #endif
@@ -1193,7 +1409,6 @@
 #define MYNEWT_VAL_BLE_LL_HCI_VS_CONN_STRICT_SCHED (0)
 #endif
 
-/* Value copied from BLE_LL_VND_EVENT_ON_ASSERT */
 #ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT
 #define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (0)
 #endif
@@ -1202,7 +1417,6 @@
 #define MYNEWT_VAL_BLE_LL_HCI_VS_LOCAL_IRK (0)
 #endif
 
-/* Value copied from BLE_ISO */
 #ifndef MYNEWT_VAL_BLE_LL_ISO
 #define MYNEWT_VAL_BLE_LL_ISO (0)
 #endif
@@ -1231,7 +1445,6 @@
 #define MYNEWT_VAL_BLE_LL_LNA_TURN_ON_US (1)
 #endif
 
-/* Value copied from BLE_LL_MFRG_ID */
 #ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID
 #define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (0x0B65)
 #endif
@@ -1276,7 +1489,6 @@
 #define MYNEWT_VAL_BLE_LL_PA_TURN_ON_US (1)
 #endif
 
-/* Value copied from BLE_PERIODIC_ADV_SYNC_BIGINFO_REPORTS */
 #ifndef MYNEWT_VAL_BLE_LL_PERIODIC_ADV_SYNC_BIGINFO_REPORTS
 #define MYNEWT_VAL_BLE_LL_PERIODIC_ADV_SYNC_BIGINFO_REPORTS (0)
 #endif
@@ -1293,7 +1505,6 @@
 #define MYNEWT_VAL_BLE_LL_RESOLV_LIST_SIZE (4)
 #endif
 
-/* Overridden by @apache-mynewt-core/hw/bsp/nordic_pca10056 (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME
 #define MYNEWT_VAL_BLE_LL_RFMGMT_ENABLE_TIME (1500)
 #endif
@@ -1302,32 +1513,26 @@
 #define MYNEWT_VAL_BLE_LL_RNG_BUFSIZE (32)
 #endif
 
-/* Value copied from BLE_ROLE_BROADCASTER */
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER
 #define MYNEWT_VAL_BLE_LL_ROLE_BROADCASTER (1)
 #endif
 
-/* Value copied from BLE_ROLE_CENTRAL */
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_CENTRAL
 #define MYNEWT_VAL_BLE_LL_ROLE_CENTRAL (1)
 #endif
 
-/* Value copied from BLE_ROLE_OBSERVER */
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_OBSERVER
 #define MYNEWT_VAL_BLE_LL_ROLE_OBSERVER (1)
 #endif
 
-/* Value copied from BLE_ROLE_PERIPHERAL */
 #ifndef MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL
 #define MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL (1)
 #endif
 
-/* Value copied from BLE_LL_OUR_SCA */
 #ifndef MYNEWT_VAL_BLE_LL_SCA
 #define MYNEWT_VAL_BLE_LL_SCA (60)
 #endif
 
-/* Value copied from BLE_LL_EXT_ADV_AUX_PTR_CNT */
 #ifndef MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT
 #define MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT (0)
 #endif
@@ -1356,12 +1561,10 @@
 #define MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES
 #define MYNEWT_VAL_BLE_LL_SUPP_MAX_RX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/controller) */
 #ifndef MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES
 #define MYNEWT_VAL_BLE_LL_SUPP_MAX_TX_BYTES (MYNEWT_VAL_BLE_LL_MAX_PKT_SIZE)
 #endif
@@ -1410,7 +1613,6 @@
 #define MYNEWT_VAL_BLE_XTAL_SETTLE_TIME (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/drivers/nrf5x */
 #ifndef MYNEWT_VAL_BLE_PHY_DBG_TIME_ADDRESS_END_PIN
 #define MYNEWT_VAL_BLE_PHY_DBG_TIME_ADDRESS_END_PIN (-1)
 #endif
@@ -1447,7 +1649,6 @@
 #define MYNEWT_VAL_BLE_PHY_VARIABLE_TIFS (0)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host */
 #ifndef MYNEWT_VAL_BLE_ATT_PREFERRED_MTU
 #define MYNEWT_VAL_BLE_ATT_PREFERRED_MTU (256)
 #endif
@@ -1760,7 +1961,6 @@
 #define MYNEWT_VAL_BLE_SM_KEYPRESS (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_SM_LEGACY
 #define MYNEWT_VAL_BLE_SM_LEGACY (0)
 #endif
@@ -1785,7 +1985,6 @@
 #define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (0)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/host) */
 #ifndef MYNEWT_VAL_BLE_SM_SC
 #define MYNEWT_VAL_BLE_SM_SC (0)
 #endif
@@ -1810,7 +2009,6 @@
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gap */
 #ifndef MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)
 #endif
@@ -1855,12 +2053,10 @@
 #define MYNEWT_VAL_BLE_SVC_GAP_SYSINIT_STAGE (301)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/host/services/gatt */
 #ifndef MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE
 #define MYNEWT_VAL_BLE_SVC_GATT_SYSINIT_STAGE (302)
 #endif
 
-/*** @apache-mynewt-nimble/nimble/transport */
 #undef MYNEWT_VAL_BLE_ACL_BUF_COUNT
 
 #undef MYNEWT_VAL_BLE_ACL_BUF_SIZE
@@ -1915,17 +2111,14 @@
 #define MYNEWT_VAL_BLE_TRANSPORT (1)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (24)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_HS_COUNT (24)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ACL_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_FROM_LL_COUNT (24)
 #endif
@@ -1934,7 +2127,6 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (251)
 #endif
 
-/* Overridden by @apache-mynewt-nimble/porting/targets/riot (defined by @apache-mynewt-nimble/nimble/transport) */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT (2)
 #endif
@@ -1976,12 +2168,10 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_HS_COUNT (10)
 #endif
 
-/* Value copied from BLE_TRANSPORT_ISO_COUNT */
 #ifndef MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT
 #define MYNEWT_VAL_BLE_TRANSPORT_ISO_FROM_LL_COUNT (10)
 #endif
@@ -2018,7 +2208,133 @@
 #define MYNEWT_VAL_BLE_TRANSPORT_LL (1)
 #endif
 
-/*** newt */
+#ifndef MYNEWT_VAL_BOOTUTIL_BOOTSTRAP
+#define MYNEWT_VAL_BOOTUTIL_BOOTSTRAP (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__none
+#define MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__none (1)
+#endif
+#ifndef MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__security_counter
+#define MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__security_counter (0)
+#endif
+#ifndef MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__version
+#define MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION__version (0)
+#endif
+#ifndef MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION
+#define MYNEWT_VAL_BOOTUTIL_DOWNGRADE_PREVENTION (1)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_ENCRYPT_EC256
+#define MYNEWT_VAL_BOOTUTIL_ENCRYPT_EC256 (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_ENCRYPT_KW
+#define MYNEWT_VAL_BOOTUTIL_ENCRYPT_KW (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_ENCRYPT_RSA
+#define MYNEWT_VAL_BOOTUTIL_ENCRYPT_RSA (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_ENCRYPT_X25519
+#define MYNEWT_VAL_BOOTUTIL_ENCRYPT_X25519 (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_FEED_WATCHDOG
+#define MYNEWT_VAL_BOOTUTIL_FEED_WATCHDOG (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_HAVE_LOGGING
+#define MYNEWT_VAL_BOOTUTIL_HAVE_LOGGING (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_HW_ROLLBACK_PROT
+#define MYNEWT_VAL_BOOTUTIL_HW_ROLLBACK_PROT (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_IMAGE_FORMAT_V2
+#define MYNEWT_VAL_BOOTUTIL_IMAGE_FORMAT_V2 (1)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_IMAGE_NUMBER
+#define MYNEWT_VAL_BOOTUTIL_IMAGE_NUMBER (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_LOG_LEVEL
+#define MYNEWT_VAL_BOOTUTIL_LOG_LEVEL (BOOTUTIL_LOG_LEVEL_INFO)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_MAX_IMG_SECTORS
+#define MYNEWT_VAL_BOOTUTIL_MAX_IMG_SECTORS (128)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_NO_LOGGING
+#define MYNEWT_VAL_BOOTUTIL_NO_LOGGING (1)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_OVERWRITE_ONLY
+#define MYNEWT_VAL_BOOTUTIL_OVERWRITE_ONLY (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_OVERWRITE_ONLY_FAST
+#define MYNEWT_VAL_BOOTUTIL_OVERWRITE_ONLY_FAST (1)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SIGN_EC256
+#define MYNEWT_VAL_BOOTUTIL_SIGN_EC256 (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SIGN_ED25519
+#define MYNEWT_VAL_BOOTUTIL_SIGN_ED25519 (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SIGN_RSA
+#define MYNEWT_VAL_BOOTUTIL_SIGN_RSA (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SIGN_RSA_LEN
+#define MYNEWT_VAL_BOOTUTIL_SIGN_RSA_LEN (2048)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SINGLE_APPLICATION_SLOT
+#define MYNEWT_VAL_BOOTUTIL_SINGLE_APPLICATION_SLOT (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SWAP_SAVE_ENCTLV
+#define MYNEWT_VAL_BOOTUTIL_SWAP_SAVE_ENCTLV (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_SWAP_USING_MOVE
+#define MYNEWT_VAL_BOOTUTIL_SWAP_USING_MOVE (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_USE_MBED_TLS
+#define MYNEWT_VAL_BOOTUTIL_USE_MBED_TLS (1)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_USE_TINYCRYPT
+#define MYNEWT_VAL_BOOTUTIL_USE_TINYCRYPT (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_VALIDATE_SLOT0
+#define MYNEWT_VAL_BOOTUTIL_VALIDATE_SLOT0 (0)
+#endif
+
+#ifndef MYNEWT_VAL_BOOTUTIL_VERSION_CMP_USE_BUILD_NUMBER
+#define MYNEWT_VAL_BOOTUTIL_VERSION_CMP_USE_BUILD_NUMBER (0)
+#endif
+
+#undef MYNEWT_VAL_MCUBOOT_DATA_SHARING
+
+#undef MYNEWT_VAL_MCUBOOT_MEASURED_BOOT
+
+#undef MYNEWT_VAL_MCUBOOT_MEASURED_BOOT_MAX_RECORD_SZ
+
+#undef MYNEWT_VAL_MCUBOOT_SHARED_DATA_BASE
+
+#undef MYNEWT_VAL_MCUBOOT_SHARED_DATA_SIZE
+
 #ifndef MYNEWT_VAL_APP_NAME
 #define MYNEWT_VAL_APP_NAME "dummy_app"
 #endif
@@ -2059,8 +2375,9 @@
 #define MYNEWT_VAL_TARGET_riot (1)
 #endif
 
-/*** Included packages */
+#define MYNEWT_PKG_apache_mynewt_core__boot_startup 1
 #define MYNEWT_PKG_apache_mynewt_core__compiler_arm_none_eabi_m4 1
+#define MYNEWT_PKG_apache_mynewt_core__crypto_mbedtls 1
 #define MYNEWT_PKG_apache_mynewt_core__crypto_tinycrypt 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_bsp_nordic_pca10056 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_cmsis_core 1
@@ -2069,9 +2386,11 @@
 #define MYNEWT_PKG_apache_mynewt_core__hw_hal 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_mcu_nordic 1
 #define MYNEWT_PKG_apache_mynewt_core__hw_mcu_nordic_nrf52xxx 1
+#define MYNEWT_PKG_apache_mynewt_core__hw_mcu_nordic_nrf_common 1
 #define MYNEWT_PKG_apache_mynewt_core__kernel_os 1
 #define MYNEWT_PKG_apache_mynewt_core__libc 1
 #define MYNEWT_PKG_apache_mynewt_core__libc_baselibc 1
+#define MYNEWT_PKG_apache_mynewt_core__mgmt_image_header 1
 #define MYNEWT_PKG_apache_mynewt_core__sys_console_stub 1
 #define MYNEWT_PKG_apache_mynewt_core__sys_defs 1
 #define MYNEWT_PKG_apache_mynewt_core__sys_flash_map 1
@@ -2094,10 +2413,13 @@
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_npl_mynewt 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_dummy_app 1
 #define MYNEWT_PKG_apache_mynewt_nimble__porting_targets_riot 1
+#define MYNEWT_PKG_mcuboot__boot_bootutil 1
+#define MYNEWT_PKG_mcuboot__boot_mynewt_flash_map_backend 1
+#define MYNEWT_PKG_mcuboot__boot_mynewt_mcuboot_config 1
 
-/*** Included APIs */
 #define MYNEWT_API_ble_driver 1
 #define MYNEWT_API_ble_transport 1
+#define MYNEWT_API_bootloader 1
 #define MYNEWT_API_console 1
 #define MYNEWT_API_log 1
 #define MYNEWT_API_stats 1