diff options
| author | Damien Le Moal <damien.lemoal@wdc.com> | 2019-01-18 10:09:14 +0300 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2019-01-21 07:28:33 +0300 |
| commit | 42283461d3f236881f67d8aa9bb8bc96decdacae (patch) | |
| tree | a71a8f0710e2218e027fe896666643c1362f1ffb | |
| parent | 868ad0b0e51a5e10e77c9bd380240b98d6a133be (diff) | |
| download | opensbi-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>
| -rw-r--r-- | docs/firmware/fw_payload.md | 1 | ||||
| -rw-r--r-- | firmware/objects.mk | 2 | ||||
| -rw-r--r-- | firmware/payloads/objects.mk | 10 | ||||
| -rw-r--r-- | firmware/payloads/test.elf.ldS (renamed from firmware/payloads/dummy.elf.ldS) | 0 | ||||
| -rw-r--r-- | firmware/payloads/test_head.S (renamed from firmware/payloads/dummy_head.S) | 2 | ||||
| -rw-r--r-- | firmware/payloads/test_main.c (renamed from firmware/payloads/dummy_main.c) | 4 |
6 files changed, 10 insertions, 9 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 diff --git a/firmware/objects.mk b/firmware/objects.mk index 1c7cc69..128834c 100644 --- a/firmware/objects.mk +++ b/firmware/objects.mk @@ -29,7 +29,7 @@ firmware-bins-$(FW_PAYLOAD) += fw_payload.bin ifdef FW_PAYLOAD_PATH FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH) else -FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/dummy.bin +FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/test.bin endif firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL) ifdef FW_PAYLOAD_OFFSET diff --git a/firmware/payloads/objects.mk b/firmware/payloads/objects.mk index 7e82b77..0395599 100644 --- a/firmware/payloads/objects.mk +++ b/firmware/payloads/objects.mk @@ -7,13 +7,13 @@ # SPDX-License-Identifier: BSD-2-Clause # -firmware-bins-$(FW_PAYLOAD) += payloads/dummy.bin +firmware-bins-$(FW_PAYLOAD) += payloads/test.bin -dummy-y += dummy_head.o -dummy-y += dummy_main.o +test-y += test_head.o +test-y += test_main.o -%/dummy.o: $(foreach obj,$(dummy-y),%/$(obj)) +%/test.o: $(foreach obj,$(test-y),%/$(obj)) $(call merge_objs,$@,$^) -%/dummy.dep: $(foreach dep,$(dummy-y:.o=.dep),%/$(dep)) +%/test.dep: $(foreach dep,$(test-y:.o=.dep),%/$(dep)) $(call merge_deps,$@,$^) diff --git a/firmware/payloads/dummy.elf.ldS b/firmware/payloads/test.elf.ldS index d0854d5..d0854d5 100644 --- a/firmware/payloads/dummy.elf.ldS +++ b/firmware/payloads/test.elf.ldS diff --git a/firmware/payloads/dummy_head.S b/firmware/payloads/test_head.S index 1b36319..e2b5f7b 100644 --- a/firmware/payloads/dummy_head.S +++ b/firmware/payloads/test_head.S @@ -65,7 +65,7 @@ _start_warm: REG_L a0, 0(a3) la a3, _boot_a1 REG_L a1, 0(a3) - call dummy_main + call test_main /* We don't expect to reach here hence just hang */ j _start_hang diff --git a/firmware/payloads/dummy_main.c b/firmware/payloads/test_main.c index d4bc360..666ce7c 100644 --- a/firmware/payloads/dummy_main.c +++ b/firmware/payloads/test_main.c @@ -22,9 +22,9 @@ static void sbi_puts(const char *str) } } -void dummy_main(unsigned long a0, unsigned long a1) +void test_main(unsigned long a0, unsigned long a1) { - sbi_puts("\nDummy Payload\n"); + sbi_puts("\nTest payload running\n"); while (1) wfi(); |