This is an automated email from the ASF dual-hosted git repository.
sjanc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new ed8c38e3d hw/bsp: Add alternate flashmap for nordic_pca10056 with 48k
bootloader
ed8c38e3d is described below
commit ed8c38e3d010c370532e4707494d02350225bcb9
Author: Szymon Janc <[email protected]>
AuthorDate: Mon Apr 27 14:41:20 2026 +0200
hw/bsp: Add alternate flashmap for nordic_pca10056 with 48k bootloader
This allows to use larger bootloader. Bootloader area is now 48k while
slot0 and 1 were reduced to 464kb. Reboot area is now moved past slot1.
Also added basic common hw/bsp package that can be used to share
global configs among BSPs.
---
hw/bsp/nordic_pca10056/bsp.yml | 32 +++++++++++++++++++++++++
hw/bsp/nordic_pca10056/pkg.yml | 1 +
hw/bsp/{nordic_pca10056 => }/pkg.yml | 26 ++------------------
hw/bsp/{nordic_pca10056/pkg.yml => syscfg.yml} | 33 +++++---------------------
4 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/hw/bsp/nordic_pca10056/bsp.yml b/hw/bsp/nordic_pca10056/bsp.yml
index d691384b6..5788b0cb1 100644
--- a/hw/bsp/nordic_pca10056/bsp.yml
+++ b/hw/bsp/nordic_pca10056/bsp.yml
@@ -58,3 +58,35 @@ bsp.flash_map:
device: 0
offset: 0x000fc000
size: 16kB
+
+bsp.flash_map.BSP_BOOTLOADER_48K:
+ areas:
+ # System areas.
+ FLASH_AREA_BOOTLOADER:
+ device: 0
+ offset: 0x00000000
+ size: 48kB
+ FLASH_AREA_IMAGE_0:
+ device: 0
+ offset: 0x0000c000
+ size: 464kB
+ FLASH_AREA_IMAGE_1:
+ device: 0
+ offset: 0x00080000
+ size: 464kB
+ FLASH_AREA_IMAGE_SCRATCH:
+ device: 0
+ offset: 0x000f8000
+ size: 16kB
+
+ # User areas.
+ FLASH_AREA_REBOOT_LOG:
+ user_id: 0
+ device: 0
+ offset: 0x000f4000
+ size: 16kB
+ FLASH_AREA_NFFS:
+ user_id: 1
+ device: 0
+ offset: 0x000fc000
+ size: 16kB
diff --git a/hw/bsp/nordic_pca10056/pkg.yml b/hw/bsp/nordic_pca10056/pkg.yml
index 5a468423f..95575935f 100644
--- a/hw/bsp/nordic_pca10056/pkg.yml
+++ b/hw/bsp/nordic_pca10056/pkg.yml
@@ -35,6 +35,7 @@ pkg.cflags.HARDFLOAT:
- -mfloat-abi=hard -mfpu=fpv4-sp-d16
pkg.deps:
+ - "@apache-mynewt-core/hw/bsp"
- "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
- "@apache-mynewt-core/libc"
- "@apache-mynewt-core/hw/scripts"
diff --git a/hw/bsp/nordic_pca10056/pkg.yml b/hw/bsp/pkg.yml
similarity index 60%
copy from hw/bsp/nordic_pca10056/pkg.yml
copy to hw/bsp/pkg.yml
index 5a468423f..412245c83 100644
--- a/hw/bsp/nordic_pca10056/pkg.yml
+++ b/hw/bsp/pkg.yml
@@ -17,29 +17,7 @@
# under the License.
#
-pkg.name: hw/bsp/nordic_pca10056
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic PCA10056 (nRF52840 DK)
+pkg.name: hw/bsp
+pkg.description: Common BSP definitions.
pkg.author: "Apache Mynewt <[email protected]>"
pkg.homepage: "http://mynewt.apache.org/";
-pkg.keywords:
- - nrf52840
- - nrf52840dk
- - nordic
- - pca10056
-
-pkg.cflags:
- - '-DNRF52840_XXAA'
-
-pkg.cflags.HARDFLOAT:
- - -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-pkg.deps:
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
- - "@apache-mynewt-core/libc"
- - "@apache-mynewt-core/hw/scripts"
- - "@apache-mynewt-core/sys/flash_map"
- - "@apache-mynewt-core/boot/startup"
-
-pkg.deps.SOFT_PWM:
- - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
diff --git a/hw/bsp/nordic_pca10056/pkg.yml b/hw/bsp/syscfg.yml
similarity index 53%
copy from hw/bsp/nordic_pca10056/pkg.yml
copy to hw/bsp/syscfg.yml
index 5a468423f..1f1c530b0 100644
--- a/hw/bsp/nordic_pca10056/pkg.yml
+++ b/hw/bsp/syscfg.yml
@@ -1,4 +1,3 @@
-#
# 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
@@ -17,29 +16,9 @@
# under the License.
#
-pkg.name: hw/bsp/nordic_pca10056
-pkg.type: bsp
-pkg.description: BSP definition for the Nordic PCA10056 (nRF52840 DK)
-pkg.author: "Apache Mynewt <[email protected]>"
-pkg.homepage: "http://mynewt.apache.org/";
-pkg.keywords:
- - nrf52840
- - nrf52840dk
- - nordic
- - pca10056
-
-pkg.cflags:
- - '-DNRF52840_XXAA'
-
-pkg.cflags.HARDFLOAT:
- - -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-pkg.deps:
- - "@apache-mynewt-core/hw/mcu/nordic/nrf52xxx"
- - "@apache-mynewt-core/libc"
- - "@apache-mynewt-core/hw/scripts"
- - "@apache-mynewt-core/sys/flash_map"
- - "@apache-mynewt-core/boot/startup"
-
-pkg.deps.SOFT_PWM:
- - "@apache-mynewt-core/hw/drivers/pwm/soft_pwm"
+syscfg.defs:
+ BSP_BOOTLOADER_48K:
+ description: >
+ Specifies that FLASH_AREA_BOOTLOADER should be at
+ least 48k.
+ value: 0
