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 1EBCEC04A68 for ; Thu, 28 Jul 2022 10:19:34 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8CFBE83F92; Thu, 28 Jul 2022 12:19:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=metanate.com header.i=@metanate.com header.b="tHFLU9jr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6A6383F92; Thu, 28 Jul 2022 12:19:30 +0200 (CEST) Received: from metanate.com (unknown [IPv6:2001:8b0:1628:5005::111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3B41583010 for ; Thu, 28 Jul 2022 12:19:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=metanate.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=john@metanate.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=metanate.com; s=stronger; h=Content-Transfer-Encoding:Message-Id:Date: Subject:Cc:To:From:Content-Type:Reply-To:Content-ID:Content-Description: In-Reply-To:References; bh=hP8SxHLnEVjn8Mmyb32ar9WDRCf2gG50HJfwx3CIDaw=; b=tH FLU9jr3sgreOFoxFPe0EhDvV7gRm0hs9j4Z5pMDxJUq6GmDkzzZWMtR6iczYOaC18yxzyDwaBih0g eKb/8FFquB1rHoj6KvQ6hbEtlaJzNYPwshLlZF2Vd7ox0IvKItIxB+N3Ag5DH6eYeweuyUeRRhdy/ 6GubwCnbxawp8wzFWNuLsZPcLlpU39IIEumVQI2i9WOxbHF/NVfyPEze8C9At1mFvjY9f1UwMZAOL o8Lq2Pd8RjBBPup7IO0QzpWNue9Q1ZrxJH6Jds9yY7S0MGYkpoiUX/lBM+FzMSAftbIrbv/w0urgE QoZ9rk+u6Qu/P3f0PTfXsVRWclox8cDQ==; Received: from [81.174.171.191] (helo=donbot.metanate.com) by email.metanate.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oH0c0-0005DU-Cu; Thu, 28 Jul 2022 11:19:25 +0100 From: John Keeping To: Simon Glass , u-boot@lists.denx.de Cc: John Keeping Subject: [PATCH v2] boot: allow bootmeth-distro without CONFIG_NET Date: Thu, 28 Jul 2022 11:19:15 +0100 Message-Id: <20220728101915.3019548-1-john@metanate.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated: YES 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.6 at phobos.denx.de X-Virus-Status: Clean Remove the dependency on CMD_PXE from BOOTMETH_DISTRO by introducing a new hidden kconfig symbol to control whether pxe_utils is compiled, allowing bootstd's distro method to be compiled without needing networking support enabled. Signed-off-by: John Keeping --- v2: - Fix MENU dependency for PXE_UTILS boot/Kconfig | 8 +++++++- boot/Makefile | 3 +-- cmd/Kconfig | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 59d0c65c94..460f13e5cb 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -294,6 +294,12 @@ endif # SPL endif # FIT +config PXE_UTILS + bool + select MENU + help + Utilities for parsing PXE file formats. + config BOOTSTD bool "Standard boot support" default y @@ -345,7 +351,7 @@ config BOOTSTD_BOOTCOMMAND config BOOTMETH_DISTRO bool "Bootdev support for distro boot" - depends on CMD_PXE + select PXE_UTILS default y help Enables support for distro boot using bootdevs. This makes the diff --git a/boot/Makefile b/boot/Makefile index a70674259c..124065a03f 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -10,8 +10,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o -obj-$(CONFIG_CMD_PXE) += pxe_utils.o -obj-$(CONFIG_CMD_SYSBOOT) += pxe_utils.o +obj-$(CONFIG_PXE_UTILS) += pxe_utils.o endif diff --git a/cmd/Kconfig b/cmd/Kconfig index a8260aa170..29d9b4008b 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1825,7 +1825,7 @@ config CMD_ETHSW config CMD_PXE bool "pxe" - select MENU + select PXE_UTILS help Boot image via network using PXE protocol @@ -2006,7 +2006,7 @@ config CMD_SOUND config CMD_SYSBOOT bool "sysboot" - select MENU + select PXE_UTILS help Boot image via local extlinux.conf file -- 2.37.1