From patchwork Fri Oct 19 12:43:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 986760 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42c5FQ239lz9sD9 for ; Fri, 19 Oct 2018 23:43:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0658BC21DD3; Fri, 19 Oct 2018 12:43:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CE21DC21C27; Fri, 19 Oct 2018 12:43:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C1D8EC21C27; Fri, 19 Oct 2018 12:43:38 +0000 (UTC) Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by lists.denx.de (Postfix) with ESMTPS id 7BA73C21BE5 for ; Fri, 19 Oct 2018 12:43:38 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0F69EACE1; Fri, 19 Oct 2018 12:43:38 +0000 (UTC) From: Alexander Graf To: u-boot@lists.denx.de Date: Fri, 19 Oct 2018 14:43:35 +0200 Message-Id: <20181019124335.56725-1-agraf@suse.de> X-Mailer: git-send-email 2.12.3 Cc: Marek Vasut Subject: [U-Boot] [PATCH] usb: Do not compile USB_STORAGE with !BLK && !DM_USB X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The USB storage driver does not compile when CONFIG_BLK is set, but DM_USB is not set, as we're missing the DM device links for CONFIG_BLK enabled code paths. So far it looks like nobody fell into this trap, because no board enabled CONFIG_BLK and CONFIG_USB_STORAGE while not enabling CONFIG_DM_USB, but we should still reflect that dependency properly in Kconfig so that implicit enabling of CONFIG_USB_STORAGE works. Signed-off-by: Alexander Graf --- drivers/usb/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 4fbe172e05..297dda1511 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -65,6 +65,7 @@ comment "USB peripherals" config USB_STORAGE bool "USB Mass Storage support" + depends on DM_USB || !BLK ---help--- Say Y here if you want to connect USB mass storage devices to your board's USB port.