You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2021/11/08 09:05:59 UTC
[mynewt-core] branch master updated (031df91 -> 42146d5)
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git.
from 031df91 tinyusb: Fix DFU configuration in std_descriptors
new 43d9337 bsp/nordic_pca10095_net: Add slot for crash
new 0e8880e bsp/nordic_pca10095: Remove unneeded scripts
new 5fc0949 bsp/nordic_pca10095: Add netcore core dump flash area
new 42146d5 bsp/nordic_pca10095: Add net core flash configuration
The 4 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:
hw/bsp/nordic_pca10095/bsp.yml | 7 +++++--
hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd | 22 ----------------------
.../nordic_pca10095/nordic_pca10095_download.cmd | 22 ----------------------
hw/bsp/nordic_pca10095/pkg.yml | 2 +-
hw/bsp/nordic_pca10095/syscfg.yml | 16 ++++++++++++++++
hw/bsp/nordic_pca10095_net/bsp.yml | 11 +++++++----
.../nordic_pca10095_net_debug.cmd | 22 ----------------------
.../nordic_pca10095_net_download.cmd | 22 ----------------------
hw/bsp/nordic_pca10095_net/syscfg.yml | 2 +-
9 files changed, 30 insertions(+), 96 deletions(-)
delete mode 100755 hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd
delete mode 100755 hw/bsp/nordic_pca10095/nordic_pca10095_download.cmd
delete mode 100755 hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.cmd
delete mode 100755 hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.cmd
[mynewt-core] 03/04: bsp/nordic_pca10095: Add netcore core dump
flash area
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 5fc09495e02b619259b743a5238fa0f0c78a6e37
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Nov 4 10:44:21 2021 +0100
bsp/nordic_pca10095: Add netcore core dump flash area
This adds definition of area from net core flash that can
be accessed to get core dumps from net core.
---
hw/bsp/nordic_pca10095/bsp.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/bsp/nordic_pca10095/bsp.yml b/hw/bsp/nordic_pca10095/bsp.yml
index 37052b78..be1b9fa 100644
--- a/hw/bsp/nordic_pca10095/bsp.yml
+++ b/hw/bsp/nordic_pca10095/bsp.yml
@@ -63,3 +63,8 @@ bsp.flash_map:
device: 0
offset: 0x000fc000
size: 16kB
+ FLASH_AREA_NET_COREDUMP:
+ user_id: 2
+ device: 2
+ offset: 0x01028000
+ size: 68kB
[mynewt-core] 02/04: bsp/nordic_pca10095: Remove unneeded scripts
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 0e8880e5b3c3d484122bf49ab58b629ae4bb86aa
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Nov 4 10:05:50 2021 +0100
bsp/nordic_pca10095: Remove unneeded scripts
Windows specific cmd files are not needed for some time now.
---
hw/bsp/nordic_pca10095/bsp.yml | 2 --
hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd | 22 ----------------------
.../nordic_pca10095/nordic_pca10095_download.cmd | 22 ----------------------
hw/bsp/nordic_pca10095_net/bsp.yml | 2 --
.../nordic_pca10095_net_debug.cmd | 22 ----------------------
.../nordic_pca10095_net_download.cmd | 22 ----------------------
6 files changed, 92 deletions(-)
diff --git a/hw/bsp/nordic_pca10095/bsp.yml b/hw/bsp/nordic_pca10095/bsp.yml
index 2e594f8..37052b78 100644
--- a/hw/bsp/nordic_pca10095/bsp.yml
+++ b/hw/bsp/nordic_pca10095/bsp.yml
@@ -31,8 +31,6 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
bsp.part2linkerscript: "hw/bsp/nordic_pca10095/split-nordic_pca10095.ld"
bsp.downloadscript: "hw/bsp/nordic_pca10095/nordic_pca10095_download.sh"
bsp.debugscript: "hw/bsp/nordic_pca10095/nordic_pca10095_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10095/nordic_pca10095_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd"
bsp.flash_map:
areas:
diff --git a/hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd b/hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd
deleted file mode 100755
index 96f0b26..0000000
--- a/hw/bsp/nordic_pca10095/nordic_pca10095_debug.cmd
+++ /dev/null
@@ -1,22 +0,0 @@
-@rem
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-@rem
-
-@rem Execute a shell with a script of the same name and .sh extension
-
-@bash "%~dp0%~n0.sh"
diff --git a/hw/bsp/nordic_pca10095/nordic_pca10095_download.cmd b/hw/bsp/nordic_pca10095/nordic_pca10095_download.cmd
deleted file mode 100755
index 96f0b26..0000000
--- a/hw/bsp/nordic_pca10095/nordic_pca10095_download.cmd
+++ /dev/null
@@ -1,22 +0,0 @@
-@rem
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-@rem
-
-@rem Execute a shell with a script of the same name and .sh extension
-
-@bash "%~dp0%~n0.sh"
diff --git a/hw/bsp/nordic_pca10095_net/bsp.yml b/hw/bsp/nordic_pca10095_net/bsp.yml
index b8b1f5a..e7bc6d3 100644
--- a/hw/bsp/nordic_pca10095_net/bsp.yml
+++ b/hw/bsp/nordic_pca10095_net/bsp.yml
@@ -31,8 +31,6 @@ bsp.linkerscript.BOOT_LOADER.OVERWRITE:
bsp.part2linkerscript: "hw/bsp/nordic_pca10095_net/split-nordic_pca10095_net.ld"
bsp.downloadscript: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.sh"
bsp.debugscript: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.sh"
-bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.cmd"
-bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.cmd"
bsp.flash_map:
areas:
diff --git a/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.cmd b/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.cmd
deleted file mode 100755
index 96f0b26..0000000
--- a/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.cmd
+++ /dev/null
@@ -1,22 +0,0 @@
-@rem
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-@rem
-
-@rem Execute a shell with a script of the same name and .sh extension
-
-@bash "%~dp0%~n0.sh"
diff --git a/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.cmd b/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.cmd
deleted file mode 100755
index 96f0b26..0000000
--- a/hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.cmd
+++ /dev/null
@@ -1,22 +0,0 @@
-@rem
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with the License. You may obtain a copy of the License at
-@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-@rem
-
-@rem Execute a shell with a script of the same name and .sh extension
-
-@bash "%~dp0%~n0.sh"
[mynewt-core] 04/04: bsp/nordic_pca10095: Add net core flash
configuration
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 42146d5473768d23d9c2c9f04b48c2f76d93034e
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Nov 4 13:30:32 2021 +0100
bsp/nordic_pca10095: Add net core flash configuration
This adds syscfg value BSP_NRF5340_NET_FLASH_ENABLE that
allows to access net core flash with ipc driver.
---
hw/bsp/nordic_pca10095/pkg.yml | 2 +-
hw/bsp/nordic_pca10095/syscfg.yml | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hw/bsp/nordic_pca10095/pkg.yml b/hw/bsp/nordic_pca10095/pkg.yml
index 7d73ca4..36dcb67 100644
--- a/hw/bsp/nordic_pca10095/pkg.yml
+++ b/hw/bsp/nordic_pca10095/pkg.yml
@@ -38,7 +38,7 @@ pkg.deps:
- "@apache-mynewt-core/libc/baselibc"
- "@apache-mynewt-core/sys/flash_map"
-pkg.deps.BSP_NRF5340_NET_ENABLE:
+pkg.deps.BSP_NRF5340_NET_FLASH_ENABLE:
- "@apache-mynewt-core/hw/drivers/flash/ipc_nrf5340_flash"
pkg.deps.SOFT_PWM:
diff --git a/hw/bsp/nordic_pca10095/syscfg.yml b/hw/bsp/nordic_pca10095/syscfg.yml
index 0f60845..4af432d 100644
--- a/hw/bsp/nordic_pca10095/syscfg.yml
+++ b/hw/bsp/nordic_pca10095/syscfg.yml
@@ -30,6 +30,12 @@ syscfg.defs:
When enabled Network Core of nRF5340 is started on init.
value: 0
+ BSP_NRF5340_NET_FLASH_ENABLE:
+ description: >
+ When enabled Application core can use Network core flash
+ with ipc flash driver.
+ value: 0
+
COREDUMP_SKIP_UNUSED_HEAP:
description: >
Store whole RAM in crash dump.
@@ -93,3 +99,13 @@ syscfg.vals.!BOOT_LOADER:
syscfg.vals.BLE_HOST:
BLE_HCI_TRANSPORT: nrf5340
BLE_HS_FLOW_CTRL: 1
+
+syscfg.vals.BSP_NRF5340_NET_ENABLE:
+ BSP_NRF5340_NET_FLASH_ENABLE: 1
+
+syscfg.vals.BSP_NRF5340_NET_FLASH_ENABLE:
+ IPC_NRF5340_CHANNELS: 4
+
+syscfg.restrictions:
+ - '!BSP_NRF5340_NET_FLASH_ENABLE || IPC_NRF5340_CHANNELS >= 4'
+ - '!BSP_NRF5340_NET_FLASH_ENABLE || BSP_NRF5340_NET_ENABLE'
[mynewt-core] 01/04: bsp/nordic_pca10095_net: Add slot for crash
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 43d9337bba2e138e407533019b2fc03c71293b45
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Nov 4 10:03:35 2021 +0100
bsp/nordic_pca10095_net: Add slot for crash
This change reduces size of primary image slot and introduces
slot for crash dump.
---
hw/bsp/nordic_pca10095_net/bsp.yml | 9 +++++++--
hw/bsp/nordic_pca10095_net/syscfg.yml | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/bsp/nordic_pca10095_net/bsp.yml b/hw/bsp/nordic_pca10095_net/bsp.yml
index 094a415..b8b1f5a 100644
--- a/hw/bsp/nordic_pca10095_net/bsp.yml
+++ b/hw/bsp/nordic_pca10095_net/bsp.yml
@@ -44,12 +44,17 @@ bsp.flash_map:
FLASH_AREA_IMAGE_0:
device: 0
offset: 0x01008000
- size: 192kB
+ size: 128kB
+ FLASH_AREA_COREDUMP:
+ user_id: 2
+ device: 0
+ offset: 0x01028000
+ size: 68kB
# This maps to app flash and uses vflash
FLASH_AREA_IMAGE_1:
device: 1
offset: 0x00000000
- size: 192kB
+ size: 128kB
FLASH_AREA_IMAGE_SCRATCH:
device: 0
offset: 0x0103a000
diff --git a/hw/bsp/nordic_pca10095_net/syscfg.yml b/hw/bsp/nordic_pca10095_net/syscfg.yml
index 2327511..cf19e16 100644
--- a/hw/bsp/nordic_pca10095_net/syscfg.yml
+++ b/hw/bsp/nordic_pca10095_net/syscfg.yml
@@ -49,7 +49,7 @@ syscfg.vals:
CONFIG_FCB_FLASH_AREA: FLASH_AREA_NFFS
REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
NFFS_FLASH_AREA: FLASH_AREA_NFFS
- COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
+ COREDUMP_FLASH_AREA: FLASH_AREA_COREDUMP
#Net Core DCDC is enabled from application core
#MCU_DCDC_ENABLED: 1
MCU_LFCLK_SOURCE: LFXO