Skip to content

Commit

Permalink
fix(boards): Remap flash to account for bootloader
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicell authored and petejohanson committed Nov 3, 2020
1 parent a32d14c commit 82a5736
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 49 deletions.
21 changes: 13 additions & 8 deletions app/boards/arm/bluemicro840/bluemicro840_v1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -82,27 +82,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};
21 changes: 13 additions & 8 deletions app/boards/arm/nice_nano/nice_nano.dts
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};
21 changes: 13 additions & 8 deletions app/boards/arm/nrf52840_m2/nrf52840_m2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};
21 changes: 13 additions & 8 deletions app/boards/arm/nrfmicro/nrfmicro_11.dts
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};
23 changes: 14 additions & 9 deletions app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};
};
21 changes: 13 additions & 8 deletions app/boards/arm/nrfmicro/nrfmicro_13.dts
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,32 @@
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "adafruit_boot";
reg = <0x000000000 0x0000C000>;
sd_partition: partition@0 {
label = "softdevice";
reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
reg = <0x00026000 0x000d2000>;
reg = <0x00026000 0x000c6000>;
};

/*
* The flash starting at 0x000f8000 and ending at
* 0x000fffff is reserved for use by the application.
* The flash starting at 0x000ec000 and ending at
* 0x000f3fff is reserved for use by the application.
*/

/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
storage_partition: partition@f8000 {
storage_partition: partition@ec000 {
label = "storage";
reg = <0x000f8000 0x00008000>;
reg = <0x000ec000 0x00008000>;
};

boot_partition: partition@f4000 {
label = "adafruit_boot";
reg = <0x000f4000 0x0000c000>;
};
};
};

0 comments on commit 82a5736

Please sign in to comment.