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 63934C7618A for ; Mon, 20 Mar 2023 05:49:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BBC1485A26; Mon, 20 Mar 2023 06:49:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="cZPisTIS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 347A185AEC; Mon, 20 Mar 2023 06:49:07 +0100 (CET) Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) (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 F2F2185283 for ; Mon, 20 Mar 2023 06:48:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-pl1-x634.google.com with SMTP id c18so11293407ple.11 for ; Sun, 19 Mar 2023 22:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679291338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GRJa3ospE0h49A4ygqmY62fskj1QxZ9ZkwjXRiy7o4I=; b=cZPisTISXahBn/8Hoz0GlCa1LnUOAjkn5SfZS2OQpS+2ECt5K9578MrX1b/jQoagxE /e1u/N88dC4PM5YNpBSZcZY9EBGUwspm2wl1TQTlCZ3kqJF88KLco/kAmPV3/WAGz4/o 8h9H1XcCW8Nch227PrX1gd/0F1GxrBIQX7nPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679291338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GRJa3ospE0h49A4ygqmY62fskj1QxZ9ZkwjXRiy7o4I=; b=FwCrjMU4jqS0Ymc/KLyQj8Nx2idO2JhZhC6cocG9CSDWTCeyPuBw3wgwqsV/Jqk/Fu C8XSbByqDsEg1WWjGiaEDno71F//xZsPipwJx3z3XszMFt2TFQ/M3uy5E/Yn5cj2P+aB 5ODsRMrBV2KlAHEsgx0HUKZ+i30syv7rWuntejR7dQCMWVHitHuHiS0LRhy/ZPWxKopR +TtMadOzSvUpBdzzcI5igAvK/LOWv8BOE2OItL0Nrdhdurv02ZTnnLDRBMuDaUxT6+oW EG/eB/EFIvKHRWOm2ySzkE8kAPHJ/Yyh+fgEseIhwmw4ZmPdXIQxzhoW18kZ7atTyTe5 zp7A== X-Gm-Message-State: AO0yUKUsjJ6ixbsztc1PXtWgPRO1nV+QRICq4JrPE6AAzSEGl5cjKEo2 l5rJ3VQgCQCM3vE7yN3qccwHEFuMH22V4GwF98g= X-Google-Smtp-Source: AK7set8C+HcJijJHSVhZmhYqEpo91EWRcDVj6yA3SbHw6Llh2cZGw8TVjqK1/3BBgVdFQ0DYvffVhg== X-Received: by 2002:a17:90b:1d8e:b0:23f:41f5:b887 with SMTP id pf14-20020a17090b1d8e00b0023f41f5b887mr14476614pjb.13.1679291337979; Sun, 19 Mar 2023 22:48:57 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id c27-20020a634e1b000000b0050be57d7ec0sm5172786pgb.67.2023.03.19.22.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Mar 2023 22:48:57 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , huang lin , Jeffy Chen , Simon Glass , Kever Yang , Philipp Tomsich , Vagrant Cascadian Subject: [PATCH v3 5/9] Move DISTRO_DEFAULTS into boot/ Date: Mon, 20 Mar 2023 18:47:57 +1300 Message-Id: <20230320054801.1273267-5-sjg@chromium.org> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog In-Reply-To: <20230320054801.1273267-1-sjg@chromium.org> References: <20230320054801.1273267-1-sjg@chromium.org> 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 This relates to booting so move it in to that Kconfig file, before changing it. Signed-off-by: Simon Glass --- (no changes since v2) Changes in v2: - Add new patch to move DISTRO_DEFAULTS into boot/ Kconfig | 27 --------------------------- boot/Kconfig | 28 +++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/Kconfig b/Kconfig index a75cce7e28fb..b8f65589f457 100644 --- a/Kconfig +++ b/Kconfig @@ -191,33 +191,6 @@ config XEN [1] - https://xenproject.org/ -config DISTRO_DEFAULTS - bool "Select defaults suitable for booting general purpose Linux distributions" - select AUTO_COMPLETE - select CMDLINE_EDITING - select CMD_BOOTI if ARM64 - select CMD_BOOTZ if ARM && !ARM64 - select CMD_DHCP if CMD_NET - select CMD_ENV_EXISTS - select CMD_EXT2 - select CMD_EXT4 - select CMD_FAT - select CMD_FS_GENERIC - select CMD_PART if PARTITIONS - select CMD_PING if CMD_NET - select CMD_PXE if NET - select CMD_SYSBOOT - select ENV_VARS_UBOOT_CONFIG - select HUSH_PARSER - select SUPPORT_RAW_INITRD - select SYS_LONGHELP - imply CMD_MII if NET - imply USB_STORAGE - imply USE_BOOTCOMMAND - help - Select this to enable various options and commands which are suitable - for building u-boot for booting general purpose Linux distributions. - config ENV_VARS_UBOOT_CONFIG bool "Add arch, board, vendor and soc variables to default environment" help diff --git a/boot/Kconfig b/boot/Kconfig index 3e567a5547c3..7da084312d67 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -408,7 +408,6 @@ if BOOTSTD config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" - depends on BOOTSTD default y imply USE_BOOTCOMMAND # Bring in some defaults which are generally needed. Boards can drop @@ -841,6 +840,33 @@ config SYS_BOOT_RAMDISK_HIGH endmenu # Boot images +config DISTRO_DEFAULTS + bool "Select defaults suitable for booting general purpose Linux distributions" + select AUTO_COMPLETE + select CMDLINE_EDITING + select CMD_BOOTI if ARM64 + select CMD_BOOTZ if ARM && !ARM64 + select CMD_DHCP if CMD_NET + select CMD_ENV_EXISTS + select CMD_EXT2 + select CMD_EXT4 + select CMD_FAT + select CMD_FS_GENERIC + select CMD_PART if PARTITIONS + select CMD_PING if CMD_NET + select CMD_PXE if NET + select CMD_SYSBOOT + select ENV_VARS_UBOOT_CONFIG + select HUSH_PARSER + select SUPPORT_RAW_INITRD + select SYS_LONGHELP + imply CMD_MII if NET + imply USB_STORAGE + imply USE_BOOTCOMMAND + help + Select this to enable various options and commands which are suitable + for building u-boot for booting general purpose Linux distributions. + menu "Boot timing" config BOOTSTAGE -- 2.40.0.rc1.284.g88254d51c5-goog