From 42283461d3f236881f67d8aa9bb8bc96decdacae Mon Sep 17 00:00:00 2001
From: Damien Le Moal <damien.lemoal@wdc.com>
Date: Fri, 18 Jan 2019 16:09:14 +0900
Subject: [PATCH] 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>
---
 docs/firmware/fw_payload.md                       |  1 +
 firmware/objects.mk                               |  2 +-
 firmware/payloads/objects.mk                      | 10 +++++-----
 firmware/payloads/{dummy.elf.ldS => test.elf.ldS} |  0
 firmware/payloads/{dummy_head.S => test_head.S}   |  2 +-
 firmware/payloads/{dummy_main.c => test_main.c}   |  4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename firmware/payloads/{dummy.elf.ldS => test.elf.ldS} (100%)
 rename firmware/payloads/{dummy_head.S => test_head.S} (98%)
 rename firmware/payloads/{dummy_main.c => test_main.c} (83%)

diff --git a/docs/firmware/fw_payload.md b/docs/firmware/fw_payload.md
index 3a8a14d5..aff254df 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 1c7cc691..128834c2 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 7e82b773..03955995 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
similarity index 100%
rename from firmware/payloads/dummy.elf.ldS
rename to firmware/payloads/test.elf.ldS
diff --git a/firmware/payloads/dummy_head.S b/firmware/payloads/test_head.S
similarity index 98%
rename from firmware/payloads/dummy_head.S
rename to firmware/payloads/test_head.S
index 1b36319e..e2b5f7b9 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
similarity index 83%
rename from firmware/payloads/dummy_main.c
rename to firmware/payloads/test_main.c
index d4bc3603..666ce7c0 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();