From: Simon Glass <sjg@chromium.org>
Date: Thu, 25 Mar 2021 08:24:40 +0000 (+1300)
Subject: Makefile: Use common code for SPI_FLASH deprecation warning
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ec384f9f1242039742e3955c774669e7d69a48ea;p=u-boot.git

Makefile: Use common code for SPI_FLASH deprecation warning

Update the CONFIG_DM_SPI_FLASH check to use the 'deprecated' function.

Tested with vinco

Old message:

===================== WARNING ======================
This board does not use CONFIG_DM_SPI_FLASH. Please update
the board to use CONFIG_SPI_FLASH before the v2019.07 release.
Failure to update by the deadline may result in board removal.
See doc/driver-model/migration.rst for more info.
====================================================

New message:

===================== WARNING ======================
This board does not use CONFIG_DM_SPI_FLASH (Driver Model
for SPI flash). Please update the board to use
CONFIG_DM_SPI_FLASH before the v2019.07 release. Failure to
update by the deadline may result in board removal.
See doc/driver-model/migration.rst for more info.
====================================================

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/Makefile b/Makefile
index 0c2f0ab0cf..c89547f6b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1096,16 +1096,8 @@ endif
 	$(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI))
 	$(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\
 		$(CONFIG_LCD)$(CONFIG_VIDEO))
-ifeq ($(CONFIG_SPI_FLASH),y)
-ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy)
-	@echo >&2 "===================== WARNING ======================"
-	@echo >&2 "This board does not use CONFIG_DM_SPI_FLASH. Please update"
-	@echo >&2 "the board to use CONFIG_SPI_FLASH before the v2019.07 release."
-	@echo >&2 "Failure to update by the deadline may result in board removal."
-	@echo >&2 "See doc/driver-model/migration.rst for more info."
-	@echo >&2 "===================================================="
-endif
-endif
+	$(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\
+		$(CONFIG_SPI_FLASH))
 ifneq ($(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG),)
 ifneq ($(CONFIG_WDT),y)
 	@echo >&2 "===================== WARNING ======================"