* [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check
@ 2019-01-08 3:57 Tom Rini
2019-01-08 13:36 ` Andy Shevchenko
2019-01-10 2:32 ` [U-Boot] " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Tom Rini @ 2019-01-08 3:57 UTC (permalink / raw)
To: u-boot
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.
Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Fixes: ea9d7c17fc4c ("dm: MIGRATION: Add migration plan for CONFIG_SATA")
Signed-off-by: Tom Rini <trini@konsulko.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check
2019-01-08 3:57 [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check Tom Rini
@ 2019-01-08 13:36 ` Andy Shevchenko
2019-01-10 2:32 ` [U-Boot] " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2019-01-08 13:36 UTC (permalink / raw)
To: u-boot
On Tue, Jan 8, 2019 at 5:58 AM Tom Rini <trini@konsulko.com> 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 <andy.shevchenko@gmail.com>
> Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Fixes: ea9d7c17fc4c ("dm: MIGRATION: Add migration plan for CONFIG_SATA")
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] Makefile: Correct logic for DM_SCSI + unconverted drivers check
2019-01-08 3:57 [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check Tom Rini
2019-01-08 13:36 ` Andy Shevchenko
@ 2019-01-10 2:32 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2019-01-10 2:32 UTC (permalink / raw)
To: u-boot
On Mon, Jan 07, 2019 at 10:57:56PM -0500, 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.
>
> Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Fixes: ea9d7c17fc4c ("dm: MIGRATION: Add migration plan for CONFIG_SATA")
> Signed-off-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190109/e1403965/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-10 2:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-08 3:57 [U-Boot] [PATCH] Makefile: Correct logic for DM_SCSI + unconverted drivers check Tom Rini
2019-01-08 13:36 ` Andy Shevchenko
2019-01-10 2:32 ` [U-Boot] " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.