Cleaned up some doc and memory layout

The memory layout of the s140 crept into a number of memory files, which can cause confusion.
This commit is contained in:
huntc 2023-01-04 10:27:16 +11:00
parent 651eec0242
commit 6e6c3cbebc
5 changed files with 8 additions and 4 deletions

View File

@ -32,3 +32,7 @@ cargo objcopy --release --bin b -- -O binary b.bin
``` ```
cargo flash --release --bin a --chip nRF52840_xxAA cargo flash --release --bin a --chip nRF52840_xxAA
``` ```
You should then see a solid LED. Pressing button 1 will cause the DFU to be loaded by the bootloader. Upon
successfully loading, you'll see the LED flash. After 5 seconds, because there is no petting of the watchdog,
you'll see the LED go solid again. This indicates that the bootloader has reverted the update.

View File

@ -5,7 +5,7 @@ MEMORY
BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K
ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K
DFU : ORIGIN = 0x00017000, LENGTH = 68K DFU : ORIGIN = 0x00017000, LENGTH = 68K
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 32K RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
} }
__bootloader_state_start = ORIGIN(BOOTLOADER_STATE); __bootloader_state_start = ORIGIN(BOOTLOADER_STATE);

View File

@ -5,7 +5,7 @@ MEMORY
BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K
FLASH : ORIGIN = 0x00007000, LENGTH = 64K FLASH : ORIGIN = 0x00007000, LENGTH = 64K
DFU : ORIGIN = 0x00017000, LENGTH = 68K DFU : ORIGIN = 0x00017000, LENGTH = 68K
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 32K RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
} }
__bootloader_state_start = ORIGIN(BOOTLOADER_STATE); __bootloader_state_start = ORIGIN(BOOTLOADER_STATE);

View File

@ -5,7 +5,7 @@ MEMORY
BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K
ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K
DFU : ORIGIN = 0x00017000, LENGTH = 68K DFU : ORIGIN = 0x00017000, LENGTH = 68K
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 32K RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
} }
__bootloader_state_start = ORIGIN(BOOTLOADER_STATE); __bootloader_state_start = ORIGIN(BOOTLOADER_STATE);

View File

@ -5,7 +5,7 @@ MEMORY
BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K BOOTLOADER_STATE : ORIGIN = 0x00006000, LENGTH = 4K
ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K ACTIVE : ORIGIN = 0x00007000, LENGTH = 64K
DFU : ORIGIN = 0x00017000, LENGTH = 68K DFU : ORIGIN = 0x00017000, LENGTH = 68K
RAM (rwx) : ORIGIN = 0x20000008, LENGTH = 32K RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
} }
__bootloader_state_start = ORIGIN(BOOTLOADER_STATE); __bootloader_state_start = ORIGIN(BOOTLOADER_STATE);