Skip to content

Commit

Permalink
address comments from review (warn users, also support 833)
Browse files Browse the repository at this point in the history
  • Loading branch information
geeksville committed Jun 16, 2020
1 parent d6019de commit 9478eb7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
16 changes: 16 additions & 0 deletions linker/nrf52833.ld
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ MEMORY

/** Location in UICR where mbr params page address is stored. */
UICR_MBR_PARAM_PAGE(r) : ORIGIN = 0x10001018, LENGTH = 0x04

/** Location in UICR of REGOUT0 (used to set voltage levels for VCC at boot)
*
* IMPORTANT NOTE: This controls the voltage provided on the VCC output of the CPU. Changing this value from the default
* can physically damage parts on your board. If using a SWD debugger you should consider connecting the Vref input
* for that debugger to the VCC rail. Think carefully before using this feature.
* Example usage:
* __attribute__ ((section(".uicrREGOUT0"))) volatile uint32_t m_uicr_regout0 = 0xfffffff4;
*/
UICR_REGOUT0(r) : ORIGIN = 0x10001304, LENGTH = 0x04
}

SECTIONS
Expand Down Expand Up @@ -74,6 +84,12 @@ SECTIONS
KEEP(*(.uicrMbrParamsPageAddress))
} > UICR_MBR_PARAM_PAGE

/* Write REGOUT0 in UICR. */
.uicrREGOUT0 :
{
KEEP(*(.uicrREGOUT0))
} > UICR_REGOUT0

.dbl_reset(NOLOAD) :
{

Expand Down
9 changes: 8 additions & 1 deletion linker/nrf52840.ld
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ MEMORY
/** Location in UICR where mbr params page address is stored. */
UICR_MBR_PARAM_PAGE(r) : ORIGIN = 0x10001018, LENGTH = 0x04

/** Location in UICR of REGOUT0 (used to set voltage levels for VCC at boot) */
/** Location in UICR of REGOUT0 (used to set voltage levels for VCC at boot)
*
* IMPORTANT NOTE: This controls the voltage provided on the VCC output of the CPU. Changing this value from the default
* can physically damage parts on your board. If using a SWD debugger you should consider connecting the Vref input
* for that debugger to the VCC rail. Think carefully before using this feature.
* Example usage:
* __attribute__ ((section(".uicrREGOUT0"))) volatile uint32_t m_uicr_regout0 = 0xfffffff4;
*/
UICR_REGOUT0(r) : ORIGIN = 0x10001304, LENGTH = 0x04
}

Expand Down

0 comments on commit 9478eb7

Please sign in to comment.