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 489B5C6FD20 for ; Fri, 24 Mar 2023 20:59:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DB21A85DB0; Fri, 24 Mar 2023 21:58:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com 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=konsulko.com header.i=@konsulko.com header.b="DM6Ii/Nt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1C0D9859F1; Fri, 24 Mar 2023 21:58:34 +0100 (CET) Received: from mail-yb1-xb34.google.com (mail-yb1-xb34.google.com [IPv6:2607:f8b0:4864:20::b34]) (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 9D70F85D6B for ; Fri, 24 Mar 2023 21:58:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-yb1-xb34.google.com with SMTP id p204so3782139ybc.12 for ; Fri, 24 Mar 2023 13:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1679691507; 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=91jybTZrqv1B3VdW5qUXy6XnqO2gNx4BGSU+iJGZ4Fc=; b=DM6Ii/Nte3tSAoHRtEdLuPCye2xe4MD4DrBVky7bDFe8fdSR5C182UN5qQMSogcOdO jH/3wRfFa7Cp/PacPqpuQ3tK2j8YyqbeZAJaPT6NYQsNBaMb8xFpxPWzz4HEXVbb6Qgw Ulz3TYupwI04XI0PSBvbMcE+COYggqSkY0zO4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679691507; 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=91jybTZrqv1B3VdW5qUXy6XnqO2gNx4BGSU+iJGZ4Fc=; b=1YRc/VXfj3wiR3/qD8FOq9uYupfgHSwux587ytk+yWBCtnA0kgwgQQA0ee/RDLYEVW e+WcvWMrC2bzI2nopwA0XnoZFObKSpTdmHqBn4NaAiLxYbQ2x6gSqKwT87aQL/zKiywg IOfLgeaWejz9zfd38qo5gWpUMt3Y2+RrGEIOexeRjMIW4kOjSWtu/NBXuWLyog093yNS KdZK3gKzmikBWyQlv2pxj+dQ5nlwRivnsrPWRiyi4wlo5cL2+gFCzZxscB9Fta+gKavG A6IgHpRGy0RhqN081kLjisQ8rC8VhK6MdnDS7TU0Q/Har+esBeyw3zu2A8XNKEFSUyWN STxg== X-Gm-Message-State: AAQBX9cPy3/qmL0QXz5LP2sR4zRsYNNjs8prgv6LBkaz8fR+PbHPoprH Oa6Hhxx1VN0O4wG7OnPBw2zQLe7Wge00ueZZI0aAbQ== X-Google-Smtp-Source: AKy350bd4GGKBw8GJExYyxNmGzp7A0QELDk4fL1JTFrCNfTjvdcitv2UIskvNW88gE06AhICJZSw1w== X-Received: by 2002:a25:3618:0:b0:b74:81b3:412c with SMTP id d24-20020a253618000000b00b7481b3412cmr3335045yba.33.1679691507198; Fri, 24 Mar 2023 13:58:27 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-523d-0f3b-e0c2-6594.res6.spectrum.com. [2603:6081:7b00:6400:523d:f3b:e0c2:6594]) by smtp.gmail.com with ESMTPSA id j83-20020a252356000000b00b7767ca7469sm680446ybj.6.2023.03.24.13.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 13:58:27 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Simon Glass Subject: [v4 2/7] Move DISTRO_DEFAULTS into boot/ Date: Fri, 24 Mar 2023 16:58:11 -0400 Message-Id: <20230324205816.2035181-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324205816.2035181-1-trini@konsulko.com> References: <20230324205816.2035181-1-trini@konsulko.com> 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 From: Simon Glass This relates to booting so move it in to that Kconfig file, before changing it. Signed-off-by: Simon Glass --- Changes in v4: None. --- Kconfig | 27 --------------------------- boot/Kconfig | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 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 5f491625c820..170ab63f27dc 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -820,6 +820,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.34.1