From 06467e4652460f619f8be4bb4859e171d35cc258 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 25 Mar 2021 21:24:32 +1300 Subject: [PATCH] Makefile: Move non-DM migration messages to the top At present the driver model migration messages are mixed with the others. Collect them together before starting to refactor them. Signed-off-by: Simon Glass --- Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 3ebb38b113..64766e2029 100644 --- a/Makefile +++ b/Makefile @@ -1037,6 +1037,21 @@ ifneq ($(CONFIG_DM_SPI)$(CONFIG_OF_CONTROL),yy) endif endif endif +ifeq ($(CONFIG_OF_EMBED),y) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" + @echo >&2 "be used for debugging purposes. Please use" + @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." + @echo >&2 "See doc/README.fdt-control for more info." + @echo >&2 "====================================================" +endif +ifneq ($(CONFIG_SPL_FIT_GENERATOR),) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" + @echo >&2 "to binman instead, to avoid the proliferation of" + @echo >&2 "arch-specific scripts with no tests." + @echo >&2 "====================================================" +endif ifneq ($(CONFIG_DM),y) @echo >&2 "===================== WARNING ======================" @echo >&2 "This board does not use CONFIG_DM. CONFIG_DM will be" @@ -1106,14 +1121,6 @@ ifneq ($(CONFIG_DM_VIDEO),y) @echo >&2 "====================================================" endif endif -ifeq ($(CONFIG_OF_EMBED),y) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" - @echo >&2 "be used for debugging purposes. Please use" - @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." - @echo >&2 "See doc/README.fdt-control for more info." - @echo >&2 "====================================================" -endif ifeq ($(CONFIG_SPI_FLASH),y) ifneq ($(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yy) @echo >&2 "===================== WARNING ======================" @@ -1145,13 +1152,6 @@ ifneq ($(CONFIG_DM_ETH),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif -endif -ifneq ($(CONFIG_SPL_FIT_GENERATOR),) - @echo >&2 "===================== WARNING ======================" - @echo >&2 "This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate" - @echo >&2 "to binman instead, to avoid the proliferation of" - @echo >&2 "arch-specific scripts with no tests." - @echo >&2 "====================================================" endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG