diff options
Diffstat (limited to 'docs/firmware/fw_payload.md')
| -rw-r--r-- | docs/firmware/fw_payload.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/firmware/fw_payload.md b/docs/firmware/fw_payload.md index 3a8a14d..aff254d 100644 --- a/docs/firmware/fw_payload.md +++ b/docs/firmware/fw_payload.md @@ -35,6 +35,7 @@ firmware: * **FW_PAYLOAD_OFFSET** - Offset from *FW_TEXT_BASE* where the payload binary will be linked in the final *FW_PAYLOAD* firmware binary image. +<<<<<<< HEAD This configuration parameter is mandatory if *FW_PAYLOAD_ALIGN* is not defined. Compilation errors will result from an incorrect definition of *FW_PAYLOAD_OFFSET* or *FW_PAYLOAD_ALIGN*, or if neither of these |