Skip to content

Commit 885c9ae

Browse files
committed
Fixing invalidation
1 parent 4fce32a commit 885c9ae

File tree

13 files changed

+334437
-386478
lines changed

13 files changed

+334437
-386478
lines changed

hw/bsp/nrf52/bsp.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ bsp.debugscript: "hw/bsp/nrf52/nrf52_debug.sh"
3434
bsp.downloadscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52/nrf52_download.cmd"
3535
bsp.debugscript.WINDOWS.OVERWRITE: "hw/bsp/nrf52/nrf52_debug.cmd"
3636

37+
# TODO: These values must sync with scripts/nrf52/flash-boot.ocd, scripts/nrf52/flash-app.ocd, hw/bsp/nrf52/boot-nrf52xxaa.ld, hw/bsp/nrf52/nrf52xxaa.ld
3738
bsp.flash_map:
3839
areas:
3940
# System areas.
@@ -44,11 +45,11 @@ bsp.flash_map:
4445
FLASH_AREA_IMAGE_0:
4546
device: 0
4647
offset: 0x00008000
47-
size: 232kB
48-
FLASH_AREA_IMAGE_1:
48+
size: 463kB # Previously 232kB
49+
FLASH_AREA_IMAGE_1: # Flash Image 1 disabled
4950
device: 0
50-
offset: 0x00042000
51-
size: 232kB
51+
offset: 0x0007bc00 # Previously 0x00042000
52+
size: 1kB # Previously 232kB
5253
FLASH_AREA_IMAGE_SCRATCH:
5354
device: 0
5455
offset: 0x0007c000

hw/bsp/nrf52/nrf52xxaa.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
MEMORY
1919
{
20-
FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 0x3a000
21-
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
20+
FLASH (rx) : ORIGIN = 0x00008000, LENGTH = 463K /* Previously 0x3a000 */
21+
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x10000
2222
}
2323

2424
/* This linker script is used for images and thus contains an image header */

logs/boot_stub.elf.lst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,8 +2429,8 @@ SysTick_Handler:
24292429

24302430
00000b00 <sysflash_map_dflt>:
24312431
...
2432-
b08: 00004000 00000001 00008000 0003a000 .@..............
2433-
b18: 00000002 00042000 0003a000 00000003 ..... ..........
2432+
b08: 00004000 00000001 00008000 00073c00 .@...........<..
2433+
b18: 00000002 0007bc00 00000400 00000003 ................
24342434
b28: 0007c000 00001000 00000010 00004000 .............@..
24352435
b38: 00004000 00000011 0007d000 00003000 [email protected]..
24362436

0 commit comments

Comments
 (0)