From 2d90226e04a6b886e9f09e6e1328600134f1a754 Mon Sep 17 00:00:00 2001
From: Anup Patel <anup.patel@wdc.com>
Date: Mon, 24 Dec 2018 10:53:10 +0530
Subject: [PATCH] firmware: Use dummy payload for FW_PAYLOAD

We use recently added separate dummy payload for FW_PAYLOAD
when FW_PAYLOAD_PATH is not specified.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
 Makefile                  |  5 ++++-
 firmware/external_deps.mk | 10 ++++++++++
 firmware/objects.mk       | 13 ++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 firmware/external_deps.mk

diff --git a/Makefile b/Makefile
index 9c55559..9c19729 100644
--- a/Makefile
+++ b/Makefile
@@ -243,12 +243,15 @@ $(build_dir)/$(platform_subdir)/%.dep: $(src_dir)/%.S
 $(build_dir)/$(platform_subdir)/%.o: $(src_dir)/%.S
 	$(call compile_as,$@,$<)
 
-# Dependency files should only be included after default Makefile rule
+# Dependency files should only be included after default Makefile rules
 # They should not be included for any "xxxconfig" or "xxxclean" rule
 all-deps-1 = $(if $(findstring config,$(MAKECMDGOALS)),,$(deps-y))
 all-deps-2 = $(if $(findstring clean,$(MAKECMDGOALS)),,$(all-deps-1))
 -include $(all-deps-2)
 
+# Include external dependency of firmwares after default Makefile rules
+include $(src_dir)/firmware/external_deps.mk
+
 install_targets-y  = install_libsbi
 ifdef PLATFORM
 install_targets-y += install_libplatsbi
diff --git a/firmware/external_deps.mk b/firmware/external_deps.mk
new file mode 100644
index 0000000..3a0847e
--- /dev/null
+++ b/firmware/external_deps.mk
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2018 Western Digital Corporation or its affiliates.
+#
+# Authors:
+#   Anup Patel <anup.patel@wdc.com>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+$(build_dir)/$(platform_subdir)/firmware/fw_payload.o: $(FW_PAYLOAD_PATH_FINAL)
diff --git a/firmware/objects.mk b/firmware/objects.mk
index 9bed733..a8275f9 100644
--- a/firmware/objects.mk
+++ b/firmware/objects.mk
@@ -7,10 +7,10 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
-firmware-cppflags-y =
-firmware-cflags-y =
-firmware-asflags-y =
-firmware-ldflags-y =
+firmware-cppflags-y +=
+firmware-cflags-y +=
+firmware-asflags-y +=
+firmware-ldflags-y +=
 
 ifdef FW_TEXT_START
 firmware-cppflags-y += -DFW_TEXT_START=$(FW_TEXT_START)
@@ -26,8 +26,11 @@ endif
 
 firmware-bins-$(FW_PAYLOAD) += fw_payload.bin
 ifdef FW_PAYLOAD_PATH
-firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH)
+FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH)
+else
+FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/dummy.bin
 endif
+firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL)
 ifdef FW_PAYLOAD_OFFSET
 firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET)
 endif