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>
This commit is contained in:
Damien Le Moal
2019-01-18 16:09:14 +09:00
committed by Anup Patel
parent 868ad0b0e5
commit 42283461d3
6 changed files with 10 additions and 9 deletions

View File

@@ -35,6 +35,7 @@ firmware:
* **FW_PAYLOAD_OFFSET** - Offset from *FW_TEXT_BASE* where the payload * **FW_PAYLOAD_OFFSET** - Offset from *FW_TEXT_BASE* where the payload
binary will be linked in the final *FW_PAYLOAD* firmware binary image. binary will be linked in the final *FW_PAYLOAD* firmware binary image.
<<<<<<< HEAD
This configuration parameter is mandatory if *FW_PAYLOAD_ALIGN* is not This configuration parameter is mandatory if *FW_PAYLOAD_ALIGN* is not
defined. Compilation errors will result from an incorrect definition defined. Compilation errors will result from an incorrect definition
of *FW_PAYLOAD_OFFSET* or *FW_PAYLOAD_ALIGN*, or if neither of these of *FW_PAYLOAD_OFFSET* or *FW_PAYLOAD_ALIGN*, or if neither of these

View File

@@ -29,7 +29,7 @@ firmware-bins-$(FW_PAYLOAD) += fw_payload.bin
ifdef FW_PAYLOAD_PATH ifdef FW_PAYLOAD_PATH
FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH) FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH)
else 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 endif
firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL) firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL)
ifdef FW_PAYLOAD_OFFSET ifdef FW_PAYLOAD_OFFSET

View File

@@ -7,13 +7,13 @@
# SPDX-License-Identifier: BSD-2-Clause # 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 test-y += test_head.o
dummy-y += dummy_main.o test-y += test_main.o
%/dummy.o: $(foreach obj,$(dummy-y),%/$(obj)) %/test.o: $(foreach obj,$(test-y),%/$(obj))
$(call merge_objs,$@,$^) $(call merge_objs,$@,$^)
%/dummy.dep: $(foreach dep,$(dummy-y:.o=.dep),%/$(dep)) %/test.dep: $(foreach dep,$(test-y:.o=.dep),%/$(dep))
$(call merge_deps,$@,$^) $(call merge_deps,$@,$^)

View File

@@ -65,7 +65,7 @@ _start_warm:
REG_L a0, 0(a3) REG_L a0, 0(a3)
la a3, _boot_a1 la a3, _boot_a1
REG_L a1, 0(a3) REG_L a1, 0(a3)
call dummy_main call test_main
/* We don't expect to reach here hence just hang */ /* We don't expect to reach here hence just hang */
j _start_hang j _start_hang

View File

@@ -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) while (1)
wfi(); wfi();