Skip to content

Commit 7f912dd

Browse files
authored
Merge pull request #251 from jpconstantineau/nrf52833-updates
nRF52833 updates to UF2/memory map for nRF52833 boards
2 parents c0666e4 + 9ced2bc commit 7f912dd

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

src/boards/bluemicro_nrf52833/pinconfig.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const uint32_t bootloaderConfig[] =
88
CFG_MAGIC0, CFG_MAGIC1, // magic
99
5, 100, // used entries, total entries
1010

11-
204, 0x100000, // FLASH_BYTES = 0x100000
12-
205, 0x40000, // RAM_BYTES = 0x40000
11+
204, 0x80000, // FLASH_BYTES
12+
205, 0x20000, // RAM_BYTES
1313
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
1414
209, 0xada52840, // UF2_FAMILY = 0xada52840
1515
210, 0x20, // PINS_PORT_SIZE = PA_32

src/boards/pca10100/pinconfig.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const uint32_t bootloaderConfig[] =
88
CFG_MAGIC0, CFG_MAGIC1, // magic
99
5, 100, // used entries, total entries
1010

11-
204, 0x100000, // FLASH_BYTES = 0x100000
12-
205, 0x40000, // RAM_BYTES = 0x40000
11+
204, 0x80000, // FLASH_BYTES
12+
205, 0x20000, // RAM_BYTES
1313
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
1414
209, 0xada52840, // UF2_FAMILY = 0xada52840
1515
210, 0x20, // PINS_PORT_SIZE = PA_32

src/usb/uf2/uf2cfg.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
#define CFG_UF2_FAMILY_BOOT_ID 0xd663823c
1515

1616
#define CFG_UF2_NUM_BLOCKS 0x10109 // just under 32MB
17-
#define CFG_UF2_FLASH_SIZE (1024*1024) // 1 MB
17+
#if defined(NRF52833_XXAA)
18+
#define CFG_UF2_FLASH_SIZE 0x80000 // 512 kB
19+
#else
20+
#define CFG_UF2_FLASH_SIZE (1024*1024) // 1 MB
21+
#endif
1822

1923
// Application Address Space
2024
#define USER_FLASH_START MBR_SIZE // skip MBR included in SD hex

0 commit comments

Comments
 (0)