Skip to content

nRF52833 updates to UF2/memory map for nRF52833 boards #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hathach merged 6 commits into from
Dec 21, 2021
Merged

nRF52833 updates to UF2/memory map for nRF52833 boards #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba4724e
bringing changes from braingram
jpconstantineau Dec 10, 2021
19cf4dc
update to bootloaderconfig memory sizes for PCA10100
jpconstantineau Dec 10, 2021
7f307ce
updated bootloader settings for memory size
jpconstantineau Dec 9, 2021
de1d6b4
bringing update to uf2cfg.h from braingram
braingram Mar 30, 2021
7008762
updated as per hathach comments
jpconstantineau Dec 20, 2021
9ced2bc
cleaned up pca10100 as well
jpconstantineau Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/boards/bluemicro_nrf52833/pinconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const uint32_t bootloaderConfig[] =
CFG_MAGIC0, CFG_MAGIC1, // magic
5, 100, // used entries, total entries

204, 0x100000, // FLASH_BYTES = 0x100000
205, 0x40000, // RAM_BYTES = 0x40000
204, 0x80000, // FLASH_BYTES
205, 0x20000, // RAM_BYTES
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
209, 0xada52840, // UF2_FAMILY = 0xada52840
210, 0x20, // PINS_PORT_SIZE = PA_32
Expand Down
4 changes: 2 additions & 2 deletions src/boards/pca10100/pinconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const uint32_t bootloaderConfig[] =
CFG_MAGIC0, CFG_MAGIC1, // magic
5, 100, // used entries, total entries

204, 0x100000, // FLASH_BYTES = 0x100000
205, 0x40000, // RAM_BYTES = 0x40000
204, 0x80000, // FLASH_BYTES
205, 0x20000, // RAM_BYTES
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
209, 0xada52840, // UF2_FAMILY = 0xada52840
210, 0x20, // PINS_PORT_SIZE = PA_32
Expand Down
6 changes: 5 additions & 1 deletion src/usb/uf2/uf2cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
#define CFG_UF2_FAMILY_BOOT_ID 0xd663823c

#define CFG_UF2_NUM_BLOCKS 0x10109 // just under 32MB
#define CFG_UF2_FLASH_SIZE (1024*1024) // 1 MB
#if defined(NRF52833_XXAA)
#define CFG_UF2_FLASH_SIZE 0x80000 // 512 kB
#else
#define CFG_UF2_FLASH_SIZE (1024*1024) // 1 MB
#endif

// Application Address Space
#define USER_FLASH_START MBR_SIZE // skip MBR included in SD hex
Expand Down