summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2019-01-18 10:09:14 +0300
committerAnup Patel <anup@brainfault.org>2019-01-21 07:28:33 +0300
commit42283461d3f236881f67d8aa9bb8bc96decdacae (patch)
treea71a8f0710e2218e027fe896666643c1362f1ffb /docs
parent868ad0b0e51a5e10e77c9bd380240b98d6a133be (diff)
downloadopensbi-42283461d3f236881f67d8aa9bb8bc96decdacae.tar.xz
payload: rename dummy payload to test payload
Use a more neutral term more representative of this payload intent. Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/firmware/fw_payload.md1
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