I'm trying to upgrade our project from v3.1 -> v4.1 of the Mesh SDK. The BOOTLOADERADDR() macro was re-defined (apparently starting in v4.0?) to use two parameters for which I can't find any documentation: MBR_BOOTLOADER_ADDR and MBR_UICR_BOOTLOADER_ADDR. Here's the code I'm referring to: https://github.com/NordicSemiconductor/nRF5-SDK-for-Mesh/blob/master/mesh/core/include/hal.h#L58
Because our project defines SOFTDEVICE_PRESENT, we then get a compilation error from uses of this macro because neither of those two MBR address parameters are defined anywhere. I understand that upgrading to 4.2 requires a bootloader update, but I don't see anything like that for 4.0/4.1.
What am I supposed to do to resolve this?