Merge #1664

1664: Generalize chip_layout.ld to Nordic boards and increase ROM size on nrf52840. r=ppannuto a=gendx ### Pull Request Overview This pull request increases the `rom` size on nrf52840-based boards to fill up the space available before apps. This makes it consistent with the nRF52-DK (which has more `rom` available despite fewer flash space overall). Files are also re-organized so that nRF52840-DK and nRF52840-Dongle share the same chip layout file. Note that the previous limit of 128KB was just exceeded in google/OpenSK#67. There are more drivers in that case (persistent storage and USB), but it's simpler to keep the limit higher in Tock than to have to maintain a separate patch for OpenSK. ### Testing Strategy This pull request was tested by: - compiling all boards with `make ci-travis`, - flashing an nRF52840-DK with OpenSK. ### TODO or Help Wanted N/A ### Documentation Updated - [x] Updated the relevant files in `/docs`, or no updates are required. ### Formatting - [x] Ran `make formatall`. Co-authored-by: Guillaume Endignoux <guillaumee@google.com>
tock · Mar 5, 2020 · 559e556 · 559e556
2 parents fbc863f + 99f21ba
commit 559e556
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/boards/nordic/nrf52dk/chip_layout.ld → boards/nordic/nrf52832_chip_layout.ld b/boards/nordic/nrf52dk/chip_layout.ld → boards/nordic/nrf52832_chip_layout.ld
diff --git a/boards/nordic/nrf52840_chip_layout.ld b/boards/nordic/nrf52840_chip_layout.ld
@@ -0,0 +1,9 @@
+/* Memory Space Definitions, 1M flash, 256K ram */
+MEMORY
+{
+  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 192K
+  prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
+}
+
+MPU_MIN_ALIGN = 8K;
diff --git a/boards/nordic/nrf52840_dongle/layout.ld b/boards/nordic/nrf52840_dongle/layout.ld
@@ -1,10 +1,2 @@
-MEMORY
-{
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 128K
-  prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
-}
-
-MPU_MIN_ALIGN = 8K;
-
+INCLUDE ../nrf52840_chip_layout.ld
 INCLUDE ../../kernel_layout.ld
diff --git a/boards/nordic/nrf52840dk/layout.ld b/boards/nordic/nrf52840dk/layout.ld
@@ -1,10 +1,2 @@
-MEMORY
-{
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 128K
-  prog (rx) : ORIGIN = 0x00030000, LENGTH = 832K
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 256K
-}
-
-MPU_MIN_ALIGN = 8K;
-
+INCLUDE ../nrf52840_chip_layout.ld
 INCLUDE ../../kernel_layout.ld
diff --git a/boards/nordic/nrf52dk/layout.ld b/boards/nordic/nrf52dk/layout.ld
@@ -1,2 +1,2 @@
-INCLUDE ./chip_layout.ld
+INCLUDE ../nrf52832_chip_layout.ld
 INCLUDE ../../kernel_layout.ld