From: Stefan Roese Date: Mon, 11 Mar 2019 13:29:23 +0100 Subject: [U-Boot] [PATCH 4/4] Makefile: Correct logic for DM_SCSI + unconverted drivers check In-Reply-To: <20190311122923.4456-1-sr@denx.de> References: <20190311122923.4456-1-sr@denx.de> Message-ID: <20190311122923.4456-4-sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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_AHCI & CONFIG_BLK by itself, as that is not a bug. This was detected when converting the Armada XP SATA driver sata_mv.c to DM with AHCI & BLK support. This warning is still printed without this patch applied here. Signed-off-by: Stefan Roese Cc: Simon Glass Cc: Tom Rini --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 26db4e7b59..896e0c3350 100644 --- a/Makefile +++ b/Makefile @@ -940,6 +940,7 @@ endif endif ifeq ($(CONFIG_LIBATA)$(CONFIG_MVSATA_IDE),y) ifneq ($(CONFIG_DM_SCSI),y) +ifneq ($(CONFIG_BLK)$(CONFIG_AHCI),yy) @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." @@ -948,6 +949,7 @@ ifneq ($(CONFIG_DM_SCSI),y) @echo >&2 "====================================================" endif endif +endif ifeq ($(CONFIG_PCI),y) ifneq ($(CONFIG_DM_PCI),y) @echo >&2 "===================== WARNING ======================" -- 2.21.0