michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: nordic nrf91* nrf53* nrf52* nrf51*: Remove scratch areas

Browse source 
The scratch partition is not needed since MCUboot now operates in
swap using move mode instead of swap with scratch, as a result, the
main partitions on Nordic nRF51, nRF52, nRF53 and nRF91 boards can be
expanded to help in fitting large applications to them.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2022-11-07 16:09:38 +00:00 • committed by Carles Cufí
commit 9a842588fb
18 changed files with 53 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

10
boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts
View file

@ -259,15 +259,11 @@ fem_spi: &spi3 {
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x00067000>;
reg = <0x0000C000 0x00076000>;
};
slot1_partition: partition@73000 {
slot1_partition: partition@82000 {
label = "image-1";
reg = <0x00073000 0x00067000>;
};
scratch_partition: partition@da000 {
label = "image-scratch";
reg = <0x000da000 0x0001e000>;
reg = <0x00082000 0x00076000>;
};
/*

10
boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts
View file

@ -158,15 +158,11 @@
};
slot0_partition: partition@8000 {
label = "image-0";
reg = <0x00008000 0x1a000>;
reg = <0x00008000 0x1b000>;
};
slot1_partition: partition@22000 {
slot1_partition: partition@23000 {
label = "image-1";
reg = <0x00022000 0x1a000>;
};
scratch_partition: partition@3c000 {
label = "image-scratch";
reg = <0x0003c000 0x2000>;
reg = <0x00023000 0x1b000>;
};
storage_partition: partition@3e000 {
label = "storage";

10
boards/arm/nrf51dongle_nrf51422/nrf51dongle_nrf51422.dts
View file

@ -95,15 +95,11 @@
};
slot0_partition: partition@8000 {
label = "image-0";
reg = <0x00008000 0x1a000>;
reg = <0x00008000 0x1b000>;
};
slot1_partition: partition@22000 {
slot1_partition: partition@23000 {
label = "image-1";
reg = <0x00022000 0x1a000>;
};
scratch_partition: partition@3c000 {
label = "image-scratch";
reg = <0x0003c000 0x2000>;
reg = <0x00023000 0x1b000>;
};
storage_partition: partition@3e000 {
label = "storage";

10
boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts
View file

@ -217,15 +217,11 @@ arduino_spi: &spi3 {
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x32000>;
reg = <0x0000C000 0x37000>;
};
slot1_partition: partition@3e000 {
slot1_partition: partition@43000 {
label = "image-1";
reg = <0x0003E000 0x32000>;
};
scratch_partition: partition@70000 {
label = "image-scratch";
reg = <0x00070000 0xA000>;
reg = <0x00043000 0x37000>;
};
storage_partition: partition@7a000 {
label = "storage";

14
boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts
View file

@ -154,19 +154,15 @@
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0xd000>;
reg = <0x0000C000 0xe000>;
};
slot1_partition: partition@19000 {
slot1_partition: partition@1a000 {
label = "image-1";
reg = <0x00019000 0xd000>;
reg = <0x0001a000 0xe000>;
};
scratch_partition: partition@26000 {
label = "image-scratch";
reg = <0x00026000 0x3000>;
};
storage_partition: partition@29000 {
storage_partition: partition@28000 {
label = "storage";
reg = <0x00029000 0x00007000>;
reg = <0x00028000 0x00008000>;
};
};
};

10
boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts
View file

@ -264,15 +264,11 @@ arduino_spi: &spi3 {
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x00067000>;
reg = <0x0000C000 0x00076000>;
};
slot1_partition: partition@73000 {
slot1_partition: partition@82000 {
label = "image-1";
reg = <0x00073000 0x00067000>;
};
scratch_partition: partition@da000 {
label = "image-scratch";
reg = <0x000da000 0x0001e000>;
reg = <0x00082000 0x00076000>;
};
/*

10
boards/arm/nrf52840dongle_nrf52840/fstab-debugger.dts
View file

@ -22,15 +22,11 @@
slot0_partition: partition@12000 {
label = "image-0";
reg = <0x00012000 0x00069000>;
reg = <0x00012000 0x00075000>;
};
slot1_partition: partition@7b000 {
slot1_partition: partition@87000 {
label = "image-1";
reg = <0x0007b000 0x00069000>;
};
scratch_partition: partition@e4000 {
label = "image-scratch";
reg = <0x000e4000 0x00018000>;
reg = <0x00087000 0x00075000>;
};
storage_partition: partition@fc000 {
label = "storage";

14
boards/arm/nrf52840dongle_nrf52840/fstab-stock.dts
View file

@ -23,19 +23,11 @@
slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 0x0005e000>;
reg = <0x00010000 0x00068000>;
};
slot1_partition: partition@6e000 {
slot1_partition: partition@78000 {
label = "image-1";
reg = <0x0006e000 0x0005e000>;
};
storage_partition: partition@cc000 {
label = "storage";
reg = <0x000cc000 0x00004000>;
};
scratch_partition: partition@d0000 {
label = "image-scratch";
reg = <0x000d0000 0x00010000>;
reg = <0x00078000 0x00068000>;
};
/* Nordic nRF5 bootloader <0xe0000 0x1c000>

12
boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts
View file

@ -129,19 +129,15 @@
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0xd000>;
reg = <0x0000C000 0xe000>;
};
slot1_partition: partition@19000 {
label = "image-1";
reg = <0x00019000 0xd000>;
reg = <0x00020000 0xe000>;
};
scratch_partition: partition@26000 {
label = "image-scratch";
reg = <0x00026000 0x3000>;
};
storage_partition: partition@29000 {
storage_partition: partition@28000 {
label = "storage";
reg = <0x00029000 0x00007000>;
reg = <0x00028000 0x00008000>;
};
};
};

14
boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts
View file

@ -132,19 +132,15 @@
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0xd000>;
reg = <0x0000C000 0xe000>;
};
slot1_partition: partition@19000 {
slot1_partition: partition@1a000 {
label = "image-1";
reg = <0x00019000 0xd000>;
reg = <0x0001a000 0xe000>;
};
scratch_partition: partition@26000 {
label = "image-scratch";
reg = <0x00026000 0x3000>;
};
storage_partition: partition@29000 {
storage_partition: partition@28000 {
label = "storage";
reg = <0x00029000 0x00007000>;
reg = <0x00028000 0x00008000>;
};
};
};

10
boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts
View file

@ -213,15 +213,11 @@ arduino_spi: &spi2 {
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x32000>;
reg = <0x0000C000 0x37000>;
};
slot1_partition: partition@3e000 {
slot1_partition: partition@43000 {
label = "image-1";
reg = <0x0003E000 0x32000>;
};
scratch_partition: partition@70000 {
label = "image-scratch";
reg = <0x00070000 0xa000>;
reg = <0x00043000 0x37000>;
};
storage_partition: partition@7a000 {
label = "storage";

9
boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_common.dts
View file

@ -252,13 +252,10 @@ arduino_spi: &spi4 {
slot1_ns_partition: partition@c0000 {
label = "image-1-nonsecure";
};
scratch_partition: partition@f0000 {
label = "image-scratch";
reg = <0x000f0000 0xa000>;
};
storage_partition: partition@fa000 {
/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
storage_partition: partition@f8000 {
label = "storage";
reg = <0x000fa000 0x00006000>;
reg = <0x000f8000 0x00008000>;
};
};
};

10
boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet.dts
View file

@ -178,15 +178,11 @@ arduino_spi: &spi0 {
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x12000>;
reg = <0x0000C000 0x17000>;
};
slot1_partition: partition@1e000 {
slot1_partition: partition@23000 {
label = "image-1";
reg = <0x0001E000 0x12000>;
};
scratch_partition: partition@30000 {
label = "image-scratch";
reg = <0x00030000 0xa000>;
reg = <0x00023000 0x17000>;
};
storage_partition: partition@3a000 {
label = "storage";

10
boards/arm/nrf9160dk_nrf52840/nrf9160dk_nrf52840.dts
View file

@ -183,15 +183,11 @@
};
slot0_partition: partition@c000 {
label = "image-0";
reg = <0x0000C000 0x00067000>;
reg = <0x0000C000 0x00076000>;
};
slot1_partition: partition@73000 {
slot1_partition: partition@82000 {
label = "image-1";
reg = <0x00073000 0x00067000>;
};
scratch_partition: partition@da000 {
label = "image-scratch";
reg = <0x000da000 0x0001e000>;
reg = <0x00082000 0x00076000>;
};
/*

9
boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts
View file

@ -246,13 +246,10 @@ arduino_spi: &spi3 {
slot1_ns_partition: partition@c0000 {
label = "image-1-nonsecure";
};
scratch_partition: partition@f0000 {
label = "image-scratch";
reg = <0x000f0000 0xa000>;
};
storage_partition: partition@fa000 {
/* 0xf0000 to 0xf7fff reserved for TF-M partitions */
storage_partition: partition@f8000 {
label = "storage";
reg = <0x000fa000 0x00006000>;
reg = <0x000f8000 0x00008000>;
};
};
};

2
tests/subsys/settings/fcb/nrf52dk_nrf52832.overlay
View file

@ -5,7 +5,7 @@
*/
/delete-node/ &storage_partition;
/delete-node/ &scratch_partition;
/delete-node/ &slot1_partition;
&flash0 {

2
tests/subsys/settings/functional/fcb/boards/nrf52dk_nrf52832.overlay
View file

@ -5,7 +5,7 @@
*/
/delete-node/ &storage_partition;
/delete-node/ &scratch_partition;
/delete-node/ &slot1_partition;
&flash0 {

2
tests/subsys/settings/functional/file/nrf52dk_nrf52832.overlay
View file

@ -5,7 +5,7 @@
*/
/delete-node/ &storage_partition;
/delete-node/ &scratch_partition;
/delete-node/ &slot1_partition;
&flash0 {