From d13aee07fdaf81eb5c5b69336840d6a2753e1cd1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:39 +1300 Subject: [PATCH] Makefile: Use common code for DM_VIDEO deprecation warning Update the CONFIG_DM_VIDEO check to use the 'deprecated' function. Tested with pxm2 Old message: ===================== WARNING ====================== This board does not use CONFIG_DM_VIDEO Please update the board to use CONFIG_DM_VIDEO 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_VIDEO (Driver Model for video). Please update the board to use CONFIG_DM_VIDEO 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 --- Makefile | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d1a9b3e9e2..0c2f0ab0cf 100644 --- a/Makefile +++ b/Makefile @@ -1094,16 +1094,8 @@ endif $(CONFIG_MVSATA_IDE)) $(call deprecated,CONFIG_AHCI,AHCI,v2019.07, $(CONFIG_LIBATA)) $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) -ifneq ($(CONFIG_LCD)$(CONFIG_VIDEO),) -ifneq ($(CONFIG_DM_VIDEO),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board does not use CONFIG_DM_VIDEO Please update" - @echo >&2 "the board to use CONFIG_DM_VIDEO 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_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 ======================"