From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:41 +1300 Subject: [PATCH v4 10/14] Makefile: Use common code for WDT deprecation warning In-Reply-To: <20210325082445.519028-1-sjg@chromium.org> References: <20210325082445.519028-1-sjg@chromium.org> Message-ID: <20210325082445.519028-11-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Update the CONFIG_WDT check to use the 'deprecated' function. Tested with kmcent2 Old message: ===================== WARNING ====================== This board does not use CONFIG_WDT (DM watchdog support). Please update the board to use CONFIG_WDT before the v2019.10 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_WDT (Driver Model for DM watchdog). Please update the board to use CONFIG_WDT before the v2019.10 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 --- (no changes since v1) Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 944b5c28bfa..3cb607ac735 100644 --- a/Makefile +++ b/Makefile @@ -1098,17 +1098,8 @@ endif $(CONFIG_LCD)$(CONFIG_VIDEO)) $(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 ======================" - @echo >&2 "This board does not use CONFIG_WDT (DM watchdog support)." - @echo >&2 "Please update the board to use CONFIG_WDT before the" - @echo >&2 "v2019.10 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_WDT,DM watchdog,v2019.10,\ + $(CONFIG_WATCHDOG)$(CONFIG_HW_WATCHDOG)) ifneq ($(CONFIG_NET),) ifneq ($(CONFIG_DM_ETH),y) @echo >&2 "===================== WARNING ======================" -- 2.31.0.291.g576ba9dcdaf-goog