From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 315E4C2B9F2 for ; Sat, 22 May 2021 12:51:57 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A752861176 for ; Sat, 22 May 2021 12:51:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A752861176 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82EC482EE0; Sat, 22 May 2021 14:50:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id A082B82EA5; Sat, 22 May 2021 14:49:05 +0200 (CEST) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 63B7682E8E for ; Sat, 22 May 2021 14:48:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f169.google.com with SMTP id v4so17340026qtp.1 for ; Sat, 22 May 2021 05:48:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cfTFeqzrapd1tFlMOGaFM1MMjntW+6/WIVTw5pY1ytA=; b=qoDdZifXKi2jWpp9E7r4KJQPViiRsg3/9HdNmzJgQl725wklWgscNc0jOBgXP9D70B moAvQmwCTwh/5EVGD9WzixaqB75L7u7URRFfl7omZIeYdagrD3zaXH3Pn4bAE4oz//DW Ea2cXgOtJFgQnSdSIXT7EVQ03A/0d/sx+is9EiLv0JmeS5URYQ64yMp1efIbKyJx7TK5 TaCxR4+S+ZzuK6/E8/vsMA+xQutRakN9nbbAOr1HGEsNMizmq4bZ5lrFFjiHAoQpcdx4 WZM9Qzqt94WENz3tnphJy3Y71GCWKJLUuTvOMBk8z0DIJXJeAibDgveB1eBQjhGEa2fM ylEg== X-Gm-Message-State: AOAM530H4vAgfXoWPFWxhOiAUMusaBySkwtXvdA6e/wUxX1yMLFhTHoX HLQQkSGIwNipF4dYBFrSHryTp8GW2Q== X-Google-Smtp-Source: ABdhPJzguleMicsKA7k2puB3YilSWB3MmerylOtbCvB0dbbTWaWoWRRorRZ8fofqWrKk6vDwvK1SGg== X-Received: by 2002:a05:622a:648:: with SMTP id a8mr2818361qtb.176.1621687728900; Sat, 22 May 2021 05:48:48 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-11dd-dc5c-4409-3388.res6.spectrum.com. [2603:6081:7b01:cbda:11dd:dc5c:4409:3388]) by smtp.gmail.com with ESMTPSA id z18sm6576940qki.55.2021.05.22.05.48.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 May 2021 05:48:48 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 18/18] usb: Require migration to DM_USB and OF_CONTROL for non-SPL cases Date: Sat, 22 May 2021 08:47:17 -0400 Message-Id: <20210522124757.18639-19-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210522124757.18639-1-trini@konsulko.com> References: <20210522124757.18639-1-trini@konsulko.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean As the deadline for migration passed with v2019.07, make support for USB depend on DM and OF_CONTROL to be enabled. Rework the Kconfig logic slightly in a few places so that SPL gadget support can exist without SPL_DM being required. Update a few defconfigs to maintain their DM_USB + !SPL_DM_USB support. Signed-off-by: Tom Rini --- Makefile | 2 -- configs/devkit3250_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/block/Kconfig | 2 +- drivers/usb/Kconfig | 9 +++++---- 11 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9b45e0e26784..b7dd5570c9c4 100644 --- a/Makefile +++ b/Makefile @@ -1087,8 +1087,6 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif - $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ - USB,v2019.07,$(CONFIG_USB)) $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(CONFIG_LCD)$(CONFIG_VIDEO)) $(call deprecated,CONFIG_DM_SPI_FLASH,SPI flash,v2019.07,\ diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 93c048cee86b..104893bee2f8 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -54,5 +54,6 @@ CONFIG_PHY_SMSC=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index d48f8082755b..db7bd12866aa 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 3256fd3493ec..5c4045a58bc3 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig index fa2adaf47d74..75c06d3663a3 100644 --- a/configs/imx6dl_mamoj_defconfig +++ b/configs/imx6dl_mamoj_defconfig @@ -52,6 +52,7 @@ CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 90ef4c8d99ac..6bd7b2100db5 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -91,6 +91,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 63c62a5c0745..08cf934b3577 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 6fc06f1ed974..3cac8d6ca2dd 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -92,6 +92,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index d1cc9a69bec8..cd1b3e4552d0 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -89,6 +89,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 1e6dad86927f..4023332dd98c 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -1,7 +1,7 @@ config BLK bool "Support block devices" depends on DM - default y if DM_MMC + default y if DM_MMC || DM_USB help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index f6975730bf8d..a3c0ceac1740 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -1,5 +1,7 @@ menuconfig USB bool "USB support" + depends on DM && OF_CONTROL + select DM_USB ---help--- Universal Serial Bus (USB) is a specification for a serial bus subsystem which offers higher speeds and more features than the @@ -31,11 +33,8 @@ menuconfig USB in and especially the links given in . -if USB - config DM_USB - bool "Enable driver model for USB" - depends on USB && DM + bool help Enable driver model for USB. The USB interface is then implemented by the USB uclass. Multiple USB controllers of different types @@ -47,6 +46,8 @@ config DM_USB declared with the U_BOOT_USB_DEVICE() macro and will be automatically probed when found on the bus. +if USB + config SPL_DM_USB bool "Enable driver model for USB in SPL" depends on SPL_DM && DM_USB -- 2.17.1