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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 0719CC77B75 for ; Sat, 6 May 2023 14:43:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 179CF85EE4; Sat, 6 May 2023 16:42:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683384175; bh=BQ+9GoSwKttKquTs/mjMOGaTtUsgPMTUIsFmQXxye6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=zLDJXObpD5G4wbFOXNLdjBCWUwBTUMFD+5Hw1HQVYPa284GR83FKUaf1chQiiEwRy 8aOXpi1CYQEKXbUkbo3dkrzfeCVx0NKQdaF0hWBF87oS3DyQeTm2r+ZAkkxu+eLaMD fYaPTrntF+QDQLdJkahS7Vb5PLpXfp4nrIH/vuaxX+GSNMDXJMZqRCJ+4RfkPqflpl iVdU+4lDDOaqVRuvyqRsCXWZ30lRu7qZZTi0s+iqwbvTNef8gV5fjkh35gKA4J0OSa zfKzEa3TcugH+1IBDxigIh619EXGfVzQVKC8sMbL1g+qzwarJIGqLi4YE3YzsFrp+p +2lPBUFpap9uw== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D4C2B85E44; Sat, 6 May 2023 16:42:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1683384172; bh=BQ+9GoSwKttKquTs/mjMOGaTtUsgPMTUIsFmQXxye6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wK3dHULYBGmDiIk/aEICGoTzAk4U9n3fLXh2eYt0g0Zm+xHkB9VoRVdKV4DDkgo9t +FIIGtibO/obOHn2UnYObY6feGjpLYPEtW62pSWYN27QGrS2CoS9MdkjUdEDnjTwoF HQh/HtPxomEghgCvQ7kje+/jcrcGyyJJDH0pXcDSEhM3+OKSyv8LNxdqxXXCCpP6WX HGFT76XaXoMlm3pIn0bbaBQ+V/R6aeufEJj+vLaRuyPsjgZ2VvFI3e5f1Hrxxb/sib 46k8OdemQtb7QGtNTuDlZEvOE7+hkrMRvvlp9ehceNM692E5BB3jreczoF1+MZDLL1 ngQiT7hiMMIFA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Andrew Davis , Chris Packham , Jim Liu , Lukasz Majewski , Samuel Holland , Simon Glass , Stefan Roese , Tom Rini , Weijie Gao Subject: [PATCH 2/4] usb: Move SPL_USB_STORAGE Kconfig symbol to drivers/usb/ Date: Sat, 6 May 2023 16:42:38 +0200 Message-Id: <20230506144240.10042-2-marex@denx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230506144240.10042-1-marex@denx.de> References: <20230506144240.10042-1-marex@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean To avoid piling up all the various Kconfig symbols in one place, i.e. common/spl/Kconfig, move the USB Kconfig symbols into drivers/usb/ . This commit moves SPL_USB_STORAGE and matching SYS_USB_FAT_BOOT_PARTITION . Signed-off-by: Marek Vasut --- Cc: Andrew Davis Cc: Chris Packham Cc: Jim Liu Cc: Lukasz Majewski Cc: Samuel Holland Cc: Simon Glass Cc: Stefan Roese Cc: Tom Rini Cc: Weijie Gao --- common/spl/Kconfig | 17 ----------------- drivers/usb/Kconfig | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 03d0fd90e09..5ad29af21cb 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1345,23 +1345,6 @@ config SPL_THERMAL automatic power-off when the temperature gets too high or low. Other devices may be discrete but connected on a suitable bus. -config SPL_USB_STORAGE - bool "Support loading from USB" - depends on SPL_USB_HOST - help - Enable support for USB devices in SPL. This allows use of USB - devices such as hard drives and flash drivers for loading U-Boot. - The actual drivers are enabled separately using the normal U-Boot - config options. This enables loading from USB using a configured - device. - -config SYS_USB_FAT_BOOT_PARTITION - int "Partition on USB to use to load U-Boot from" - depends on SPL_USB_STORAGE - default 1 - help - Partition on the USB storage device to load U-Boot from - config SPL_USB_GADGET bool "Suppport USB Gadget drivers" help diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 94fb32d107c..a972d87c7ad 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -126,6 +126,28 @@ config USB_HUB_DEBOUNCE_TIMEOUT value = 1s because some usb device needs around 1.5s to be initialized and a 2s value should solve detection issue on problematic USB keys. +if SPL_USB_HOST + +comment "USB peripherals in SPL" + +config SPL_USB_STORAGE + bool "Support loading from USB" + help + Enable support for USB devices in SPL. This allows use of USB + devices such as hard drives and flash drivers for loading U-Boot. + The actual drivers are enabled separately using the normal U-Boot + config options. This enables loading from USB using a configured + device. + +config SYS_USB_FAT_BOOT_PARTITION + int "Partition on USB to use to load U-Boot from" + depends on SPL_USB_STORAGE + default 1 + help + Partition on the USB storage device to load U-Boot from. + +endif + if USB_KEYBOARD config USB_KEYBOARD_FN_KEYS -- 2.39.2