You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2017/11/17 03:09:23 UTC
[GitHub] ccollins476ad closed pull request #657: apollo2_evb - Workaround for ROM-boot MSP issue.
ccollins476ad closed pull request #657: apollo2_evb - Workaround for ROM-boot MSP issue.
URL: https://github.com/apache/mynewt-core/pull/657
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/bsp/apollo2_evb/apollo2.ld b/hw/bsp/apollo2_evb/apollo2.ld
index 1090ccde3..33fb5dd5c 100755
--- a/hw/bsp/apollo2_evb/apollo2.ld
+++ b/hw/bsp/apollo2_evb/apollo2.ld
@@ -18,7 +18,13 @@
MEMORY
{
FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 0x3a000
- RAM (rwx) : ORIGIN = 0x10000000, LENGTH = 0x40000
+
+ /* NOTE: The last 8 bytes of SRAM are intentionally excluded. The Apollo2's
+ * in-ROM boot loader crashes when the initial stack pointer is at the end of
+ * RAM. Reducing the size of RAM slightly forces the initial MSP down by 8
+ * bytes.
+ */
+ RAM (rwx) : ORIGIN = 0x10000000, LENGTH = 0x3fff8
}
/* This linker script is used for images and thus contains an image header */
diff --git a/hw/bsp/apollo2_evb/boot-apollo2.ld b/hw/bsp/apollo2_evb/boot-apollo2.ld
index 6cac33462..025dc8a50 100755
--- a/hw/bsp/apollo2_evb/boot-apollo2.ld
+++ b/hw/bsp/apollo2_evb/boot-apollo2.ld
@@ -17,8 +17,14 @@
*/
MEMORY
{
- FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x100000
- RAM (rwx) : ORIGIN = 0x10000000, LENGTH = 0x40000
+ FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x4000
+
+ /* NOTE: The last 8 bytes of SRAM are intentionally excluded. The Apollo2's
+ * in-ROM boot loader crashes when the initial stack pointer is at the end of
+ * RAM. Reducing the size of RAM slightly forces the initial MSP down by 8
+ * bytes.
+ */
+ RAM (rwx) : ORIGIN = 0x10000000, LENGTH = 0x3fff8
}
/* The bootloader does not contain an image header */
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services