From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Date: Tue, 8 Jan 2019 15:36:33 +0200 Subject: [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check In-Reply-To: <1546919876-1635-1-git-send-email-trini@konsulko.com> References: <1546919876-1635-1-git-send-email-trini@konsulko.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Tue, Jan 8, 2019 at 5:58 AM Tom Rini wrote: > > When checking for boards that are enabling a SATA driver that isn't > converted to DM yet we need to be sure to not also trip over boards that > do set CONFIG_DM_SCSI by itself, as that is not a bug. > Thanks! It fixes a bogus message, Tested-by: Andy Shevchenko > Reported-by: Andy Shevchenko > Fixes: ea9d7c17fc4c ("dm: MIGRATION: Add migration plan for CONFIG_SATA") > Signed-off-by: Tom Rini > --- > Makefile | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 27c09199a446..e3e54a393f68 100644 > --- a/Makefile > +++ b/Makefile > @@ -938,7 +938,8 @@ ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) > @echo >&2 "====================================================" > endif > endif > -ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) > +ifeq ($(CONFIG_LIBATA)$(CONFIG_MVSATA_IDE),y) > +ifneq ($(CONFIG_DM_SCSI),y) > @echo >&2 "===================== WARNING ======================" > @echo >&2 "This board does not use CONFIG_DM_SCSI. Please update" > @echo >&2 "the storage controller to use CONFIG_DM_SCSI before the v2019.07 release." > @@ -946,6 +947,7 @@ ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) > @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." > @echo >&2 "====================================================" > endif > +endif > ifeq ($(CONFIG_OF_EMBED),y) > @echo >&2 "===================== WARNING ======================" > @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" > -- > 2.7.4 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > https://lists.denx.de/listinfo/u-boot -- With Best Regards, Andy Shevchenko