nimble/porting: Remove not needed sysflash
Ports do not use sysflash.
diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h
index e4d2d3a..c7230e4 100644
--- a/porting/examples/linux/include/syscfg/syscfg.h
+++ b/porting/examples/linux/include/syscfg/syscfg.h
@@ -1,5 +1,5 @@
/**
- * This file was generated by Apache newt version: 1.12.0-dev
+ * This file was generated by Apache newt version: 1.12.0
*/
#ifndef H_MYNEWT_SYSCFG_
@@ -15,6 +15,7 @@
#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
@@ -599,8 +600,8 @@
#define MYNEWT_VAL_BLE_ATT_SVR_WRITE_NO_RSP (1)
#endif
-#ifndef MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS
-#define MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS (0)
+#ifndef MYNEWT_VAL_BLE_AUDIO
+#define MYNEWT_VAL_BLE_AUDIO (0)
#endif
#ifndef MYNEWT_VAL_BLE_EATT_CHAN_NUM
@@ -775,6 +776,14 @@
#define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
#endif
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
+#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
+#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
+#endif
+
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM
#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
#endif
@@ -807,14 +816,6 @@
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
#endif
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
-#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
-#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
-#endif
-
#ifndef MYNEWT_VAL_BLE_MESH
#define MYNEWT_VAL_BLE_MESH (0)
#endif
diff --git a/porting/examples/linux/include/sysflash/sysflash.h b/porting/examples/linux/include/sysflash/sysflash.h
deleted file mode 100644
index 2f4d843..0000000
--- a/porting/examples/linux/include/sysflash/sysflash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * This file was generated by Apache newt version: 1.12.0-dev
- */
-
-#ifndef H_MYNEWT_SYSFLASH_
-#define H_MYNEWT_SYSFLASH_
-
-#include "flash_map/flash_map.h"
-
-#define FLASH_AREA_COUNT 6
-
-/**
- * This flash map definition is used for two purposes:
- * 1. To locate the meta area, which contains the true flash map definition.
- * 2. As a fallback in case the meta area cannot be read from flash.
- */
-extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
-
-/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
-
-#define FLASH_AREA_BOOTLOADER 0
-#define FLASH_AREA_BOOTLOADER_DEVICE 0
-#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000
-#define FLASH_AREA_BOOTLOADER_SIZE 16384
-
-#define FLASH_AREA_IMAGE_0 1
-#define FLASH_AREA_IMAGE_0_DEVICE 0
-#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000
-#define FLASH_AREA_IMAGE_0_SIZE 393216
-
-#define FLASH_AREA_IMAGE_1 2
-#define FLASH_AREA_IMAGE_1_DEVICE 0
-#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000
-#define FLASH_AREA_IMAGE_1_SIZE 393216
-
-#define FLASH_AREA_IMAGE_SCRATCH 3
-#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0
-#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000
-#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072
-
-#define FLASH_AREA_REBOOT_LOG 16
-#define FLASH_AREA_REBOOT_LOG_DEVICE 0
-#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000
-#define FLASH_AREA_REBOOT_LOG_SIZE 16384
-
-#define FLASH_AREA_NFFS 17
-#define FLASH_AREA_NFFS_DEVICE 0
-#define FLASH_AREA_NFFS_OFFSET 0x00008000
-#define FLASH_AREA_NFFS_SIZE 32768
-
-#endif
diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h
index 3919eb1..ee1db3c 100644
--- a/porting/examples/linux_blemesh/include/syscfg/syscfg.h
+++ b/porting/examples/linux_blemesh/include/syscfg/syscfg.h
@@ -1,5 +1,5 @@
/**
- * This file was generated by Apache newt version: 1.12.0-dev
+ * This file was generated by Apache newt version: 1.12.0
*/
#ifndef H_MYNEWT_SYSCFG_
@@ -15,6 +15,7 @@
#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
@@ -600,8 +601,8 @@
#define MYNEWT_VAL_BLE_ATT_SVR_WRITE_NO_RSP (1)
#endif
-#ifndef MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS
-#define MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS (0)
+#ifndef MYNEWT_VAL_BLE_AUDIO
+#define MYNEWT_VAL_BLE_AUDIO (0)
#endif
#ifndef MYNEWT_VAL_BLE_EATT_CHAN_NUM
@@ -776,6 +777,14 @@
#define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
#endif
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
+#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
+#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
+#endif
+
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM
#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
#endif
@@ -808,14 +817,6 @@
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
#endif
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
-#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
-#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
-#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)
@@ -1328,7 +1329,7 @@
/* 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
diff --git a/porting/examples/linux_blemesh/include/sysflash/sysflash.h b/porting/examples/linux_blemesh/include/sysflash/sysflash.h
deleted file mode 100644
index 2f4d843..0000000
--- a/porting/examples/linux_blemesh/include/sysflash/sysflash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * This file was generated by Apache newt version: 1.12.0-dev
- */
-
-#ifndef H_MYNEWT_SYSFLASH_
-#define H_MYNEWT_SYSFLASH_
-
-#include "flash_map/flash_map.h"
-
-#define FLASH_AREA_COUNT 6
-
-/**
- * This flash map definition is used for two purposes:
- * 1. To locate the meta area, which contains the true flash map definition.
- * 2. As a fallback in case the meta area cannot be read from flash.
- */
-extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
-
-/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
-
-#define FLASH_AREA_BOOTLOADER 0
-#define FLASH_AREA_BOOTLOADER_DEVICE 0
-#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000
-#define FLASH_AREA_BOOTLOADER_SIZE 16384
-
-#define FLASH_AREA_IMAGE_0 1
-#define FLASH_AREA_IMAGE_0_DEVICE 0
-#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000
-#define FLASH_AREA_IMAGE_0_SIZE 393216
-
-#define FLASH_AREA_IMAGE_1 2
-#define FLASH_AREA_IMAGE_1_DEVICE 0
-#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000
-#define FLASH_AREA_IMAGE_1_SIZE 393216
-
-#define FLASH_AREA_IMAGE_SCRATCH 3
-#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0
-#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000
-#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072
-
-#define FLASH_AREA_REBOOT_LOG 16
-#define FLASH_AREA_REBOOT_LOG_DEVICE 0
-#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000
-#define FLASH_AREA_REBOOT_LOG_SIZE 16384
-
-#define FLASH_AREA_NFFS 17
-#define FLASH_AREA_NFFS_DEVICE 0
-#define FLASH_AREA_NFFS_OFFSET 0x00008000
-#define FLASH_AREA_NFFS_SIZE 32768
-
-#endif
diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h
index 16cdc6c..48a830a 100644
--- a/porting/examples/nuttx/include/syscfg/syscfg.h
+++ b/porting/examples/nuttx/include/syscfg/syscfg.h
@@ -1,5 +1,5 @@
/**
- * This file was generated by Apache newt version: 1.12.0-dev
+ * This file was generated by Apache newt version: 1.12.0
*/
#ifndef H_MYNEWT_SYSCFG_
@@ -15,6 +15,7 @@
#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
@@ -599,8 +600,8 @@
#define MYNEWT_VAL_BLE_ATT_SVR_WRITE_NO_RSP (1)
#endif
-#ifndef MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS
-#define MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS (0)
+#ifndef MYNEWT_VAL_BLE_AUDIO
+#define MYNEWT_VAL_BLE_AUDIO (0)
#endif
#ifndef MYNEWT_VAL_BLE_EATT_CHAN_NUM
@@ -775,6 +776,14 @@
#define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
#endif
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
+#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
+#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
+#endif
+
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM
#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
#endif
@@ -807,14 +816,6 @@
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
#endif
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
-#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
-#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
-#endif
-
#ifndef MYNEWT_VAL_BLE_MESH
#define MYNEWT_VAL_BLE_MESH (0)
#endif
diff --git a/porting/examples/nuttx/include/sysflash/sysflash.h b/porting/examples/nuttx/include/sysflash/sysflash.h
deleted file mode 100644
index 2f4d843..0000000
--- a/porting/examples/nuttx/include/sysflash/sysflash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * This file was generated by Apache newt version: 1.12.0-dev
- */
-
-#ifndef H_MYNEWT_SYSFLASH_
-#define H_MYNEWT_SYSFLASH_
-
-#include "flash_map/flash_map.h"
-
-#define FLASH_AREA_COUNT 6
-
-/**
- * This flash map definition is used for two purposes:
- * 1. To locate the meta area, which contains the true flash map definition.
- * 2. As a fallback in case the meta area cannot be read from flash.
- */
-extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
-
-/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
-
-#define FLASH_AREA_BOOTLOADER 0
-#define FLASH_AREA_BOOTLOADER_DEVICE 0
-#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000
-#define FLASH_AREA_BOOTLOADER_SIZE 16384
-
-#define FLASH_AREA_IMAGE_0 1
-#define FLASH_AREA_IMAGE_0_DEVICE 0
-#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000
-#define FLASH_AREA_IMAGE_0_SIZE 393216
-
-#define FLASH_AREA_IMAGE_1 2
-#define FLASH_AREA_IMAGE_1_DEVICE 0
-#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000
-#define FLASH_AREA_IMAGE_1_SIZE 393216
-
-#define FLASH_AREA_IMAGE_SCRATCH 3
-#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0
-#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000
-#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072
-
-#define FLASH_AREA_REBOOT_LOG 16
-#define FLASH_AREA_REBOOT_LOG_DEVICE 0
-#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000
-#define FLASH_AREA_REBOOT_LOG_SIZE 16384
-
-#define FLASH_AREA_NFFS 17
-#define FLASH_AREA_NFFS_DEVICE 0
-#define FLASH_AREA_NFFS_OFFSET 0x00008000
-#define FLASH_AREA_NFFS_SIZE 32768
-
-#endif
diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h
index 4054f14..37fe32d 100644
--- a/porting/nimble/include/syscfg/syscfg.h
+++ b/porting/nimble/include/syscfg/syscfg.h
@@ -1,5 +1,5 @@
/**
- * This file was generated by Apache newt version: 1.12.0-dev
+ * This file was generated by Apache newt version: 1.12.0
*/
#ifndef H_MYNEWT_SYSCFG_
@@ -15,6 +15,7 @@
#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
@@ -598,8 +599,8 @@
#define MYNEWT_VAL_BLE_ATT_SVR_WRITE_NO_RSP (1)
#endif
-#ifndef MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS
-#define MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS (0)
+#ifndef MYNEWT_VAL_BLE_AUDIO
+#define MYNEWT_VAL_BLE_AUDIO (0)
#endif
#ifndef MYNEWT_VAL_BLE_EATT_CHAN_NUM
@@ -774,6 +775,14 @@
#define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
#endif
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
+#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
+#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
+#endif
+
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM
#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
#endif
@@ -806,14 +815,6 @@
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
#endif
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
-#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
-#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
-#endif
-
#ifndef MYNEWT_VAL_BLE_MESH
#define MYNEWT_VAL_BLE_MESH (0)
#endif
diff --git a/porting/nimble/include/sysflash/sysflash.h b/porting/nimble/include/sysflash/sysflash.h
deleted file mode 100644
index 2f4d843..0000000
--- a/porting/nimble/include/sysflash/sysflash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * This file was generated by Apache newt version: 1.12.0-dev
- */
-
-#ifndef H_MYNEWT_SYSFLASH_
-#define H_MYNEWT_SYSFLASH_
-
-#include "flash_map/flash_map.h"
-
-#define FLASH_AREA_COUNT 6
-
-/**
- * This flash map definition is used for two purposes:
- * 1. To locate the meta area, which contains the true flash map definition.
- * 2. As a fallback in case the meta area cannot be read from flash.
- */
-extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
-
-/* Flash map was defined in @apache-mynewt-core/hw/bsp/native */
-
-#define FLASH_AREA_BOOTLOADER 0
-#define FLASH_AREA_BOOTLOADER_DEVICE 0
-#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000
-#define FLASH_AREA_BOOTLOADER_SIZE 16384
-
-#define FLASH_AREA_IMAGE_0 1
-#define FLASH_AREA_IMAGE_0_DEVICE 0
-#define FLASH_AREA_IMAGE_0_OFFSET 0x00020000
-#define FLASH_AREA_IMAGE_0_SIZE 393216
-
-#define FLASH_AREA_IMAGE_1 2
-#define FLASH_AREA_IMAGE_1_DEVICE 0
-#define FLASH_AREA_IMAGE_1_OFFSET 0x00080000
-#define FLASH_AREA_IMAGE_1_SIZE 393216
-
-#define FLASH_AREA_IMAGE_SCRATCH 3
-#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0
-#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000e0000
-#define FLASH_AREA_IMAGE_SCRATCH_SIZE 131072
-
-#define FLASH_AREA_REBOOT_LOG 16
-#define FLASH_AREA_REBOOT_LOG_DEVICE 0
-#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00004000
-#define FLASH_AREA_REBOOT_LOG_SIZE 16384
-
-#define FLASH_AREA_NFFS 17
-#define FLASH_AREA_NFFS_DEVICE 0
-#define FLASH_AREA_NFFS_OFFSET 0x00008000
-#define FLASH_AREA_NFFS_SIZE 32768
-
-#endif
diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h
index 1c46e12..236e8cf 100644
--- a/porting/npl/riot/include/syscfg/syscfg.h
+++ b/porting/npl/riot/include/syscfg/syscfg.h
@@ -1,5 +1,5 @@
/**
- * This file was generated by Apache newt version: 1.12.0-dev
+ * This file was generated by Apache newt version: 1.12.0
*/
#ifndef H_MYNEWT_SYSCFG_
@@ -15,6 +15,7 @@
#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_HARDFLOAT
#define MYNEWT_VAL_HARDFLOAT (0)
#endif
@@ -1205,7 +1206,6 @@
#define MYNEWT_VAL_BLE_LL_ISO (0)
#endif
-/* Value copied from BLE_LL_ISO_BROADCASTER */
#ifndef MYNEWT_VAL_BLE_LL_ISO_BROADCASTER
#define MYNEWT_VAL_BLE_LL_ISO_BROADCASTER (0)
#endif
@@ -1515,8 +1515,8 @@
#define MYNEWT_VAL_BLE_ATT_SVR_WRITE_NO_RSP (1)
#endif
-#ifndef MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS
-#define MYNEWT_VAL_BLE_AUDIO_MAX_CODEC_RECORDS (0)
+#ifndef MYNEWT_VAL_BLE_AUDIO
+#define MYNEWT_VAL_BLE_AUDIO (0)
#endif
#ifndef MYNEWT_VAL_BLE_EATT_CHAN_NUM
@@ -1691,6 +1691,14 @@
#define MYNEWT_VAL_BLE_HS_SYSINIT_STAGE (200)
#endif
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
+#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
+#endif
+
+#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
+#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
+#endif
+
#ifndef MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM
#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
#endif
@@ -1723,14 +1731,6 @@
#define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
#endif
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BIGS
-#define MYNEWT_VAL_BLE_ISO_MAX_BIGS (MYNEWT_VAL_BLE_MULTI_ADV_INSTANCES)
-#endif
-
-#ifndef MYNEWT_VAL_BLE_ISO_MAX_BISES
-#define MYNEWT_VAL_BLE_ISO_MAX_BISES (4)
-#endif
-
#ifndef MYNEWT_VAL_BLE_MESH
#define MYNEWT_VAL_BLE_MESH (0)
#endif
diff --git a/porting/npl/riot/include/sysflash/sysflash.h b/porting/npl/riot/include/sysflash/sysflash.h
deleted file mode 100644
index 0194dc4..0000000
--- a/porting/npl/riot/include/sysflash/sysflash.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * This file was generated by Apache newt version: 1.12.0-dev
- */
-
-#ifndef H_MYNEWT_SYSFLASH_
-#define H_MYNEWT_SYSFLASH_
-
-#include "flash_map/flash_map.h"
-
-#define FLASH_AREA_COUNT 6
-
-/**
- * This flash map definition is used for two purposes:
- * 1. To locate the meta area, which contains the true flash map definition.
- * 2. As a fallback in case the meta area cannot be read from flash.
- */
-extern const struct flash_area sysflash_map_dflt[FLASH_AREA_COUNT];
-
-/* Flash map was defined in @apache-mynewt-core/hw/bsp/nordic_pca10056 */
-
-#define FLASH_AREA_BOOTLOADER 0
-#define FLASH_AREA_BOOTLOADER_DEVICE 0
-#define FLASH_AREA_BOOTLOADER_OFFSET 0x00000000
-#define FLASH_AREA_BOOTLOADER_SIZE 32768
-
-#define FLASH_AREA_IMAGE_0 1
-#define FLASH_AREA_IMAGE_0_DEVICE 0
-#define FLASH_AREA_IMAGE_0_OFFSET 0x0000c000
-#define FLASH_AREA_IMAGE_0_SIZE 483328
-
-#define FLASH_AREA_IMAGE_1 2
-#define FLASH_AREA_IMAGE_1_DEVICE 0
-#define FLASH_AREA_IMAGE_1_OFFSET 0x00082000
-#define FLASH_AREA_IMAGE_1_SIZE 483328
-
-#define FLASH_AREA_IMAGE_SCRATCH 3
-#define FLASH_AREA_IMAGE_SCRATCH_DEVICE 0
-#define FLASH_AREA_IMAGE_SCRATCH_OFFSET 0x000f8000
-#define FLASH_AREA_IMAGE_SCRATCH_SIZE 16384
-
-#define FLASH_AREA_REBOOT_LOG 16
-#define FLASH_AREA_REBOOT_LOG_DEVICE 0
-#define FLASH_AREA_REBOOT_LOG_OFFSET 0x00008000
-#define FLASH_AREA_REBOOT_LOG_SIZE 16384
-
-#define FLASH_AREA_NFFS 17
-#define FLASH_AREA_NFFS_DEVICE 0
-#define FLASH_AREA_NFFS_OFFSET 0x000fc000
-#define FLASH_AREA_NFFS_SIZE 16384
-
-#endif
diff --git a/porting/update_generated_files.sh b/porting/update_generated_files.sh
index 006498e..7365bc3 100755
--- a/porting/update_generated_files.sh
+++ b/porting/update_generated_files.sh
@@ -33,8 +33,9 @@
for target in "${!targets[@]}"; do
echo "Updating target $target"
newt build "@apache-mynewt-nimble/porting/targets/$target" > /dev/null 2>&1
- # logcfg is not used in ports
+ # logcfg and sysflash is not used in ports
rm -rf "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include/logcfg"
+ rm -rf "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include/sysflash"
cp "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include" "${targets[$target]}" -r
# Remove repo version and hash MYNEWT_VALS as it doesn't make much sense to commit them and they
# defeat the purpose of this script.
