From patchwork Tue Jul 11 22:37:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1806544 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="key not found in DNS" header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=CsvK9c7O; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R0wjx19sKz20ZZ for ; Wed, 12 Jul 2023 08:37:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56B2586924; Wed, 12 Jul 2023 00:37:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se 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=kwiboo.se header.i=@kwiboo.se header.b="CsvK9c7O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CC7D58690B; Wed, 12 Jul 2023 00:37:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from s.wrqvtzvf.outbound-mail.sendgrid.net (s.wrqvtzvf.outbound-mail.sendgrid.net [149.72.126.143]) (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 560E886926 for ; Wed, 12 Jul 2023 00:37:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:mime-version:to:cc:content-transfer-encoding: content-type:cc:content-type:from:subject:to; s=s1; bh=64oREeSCnnLS44eDZE7AIO5fzxCqGfKQyCUOqTeGfu8=; b=CsvK9c7Ocd7ueV+zUeBzVZLT9d4BrIH8UrwKP0dQ7qDtPTa1+Ke6YzyThx5Md6NgePuV Gjmkm4d5gYwuFQTa4KzQLu7hQp4EYU151u0le9Tdti4xwsi6BcUr2iOD5ICqw8Fm4/8L5j v5ksIMkytaKPV9/VyX7bNygAquA9etWGEED1cDuccIp45IhhJGP6UEeAFV454S5fwjt2zl f5n7brtkOgmSEAGRZXR5NGzGfKm8AYdoKV9wTHSQeunzVxg5j5tH/J864fu2D1kFoyFJ6Y zao/Czvnvga0dSIkJMZYXOQ29mlJ/d9Dhpx60Iv6XY6Wt2aBqLigX0oHn0E6AmFQ== Received: by filterdrecv-8684c58db7-5mfx8 with SMTP id filterdrecv-8684c58db7-5mfx8-1-64ADD9A9-23 2023-07-11 22:37:30.135526796 +0000 UTC m=+5353157.536937228 Received: from bionic.localdomain (unknown) by geopod-ismtpd-6 (SG) with ESMTP id Cx3x4gnPQEuuk9zzMBPFTA Tue, 11 Jul 2023 22:37:29.622 +0000 (UTC) From: Jonas Karlman Subject: [PATCH] disk: Use BOOT_DEFAULTS instead of DISTRO_DEFAULTS Date: Tue, 11 Jul 2023 22:37:30 +0000 (UTC) Message-ID: <20230711223727.3738785-1-jonas@kwiboo.se> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h4f+tm+K3e+yzplC/f8TI3dH+tcsuDBaXLL51GL8NmXgNryhjTyWk96eOUnPR5xnqZLj2ATX30ZEHxivXqbiYFFJgdt6JYe8AudFSoBmq67Kr88YRpc7ZaTghtNQ24allf0nnzjMIvQIRgf2KqR5jpUT2bXYNahojjcgontS5fqS To: Simon Glass Cc: Jonas Karlman , u-boot@lists.denx.de X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== 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 Set default y based on common BOOT_DEFAULTS instead of DISTRO_DEFAULTS. No change is intended, affected options is already implied for DISTRO and BOOTSTD due to BOOT_DEFAULTS imply DOS_PARTITION (USB_STORAGE), EFI_PARTITION and ISO_PARTITION. Fixes: a0c739c184ca ("boot: Create a common BOOT_DEFAULTS for distro and bootstd") Signed-off-by: Jonas Karlman Reviewed-by: Simon Glass --- disk/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/disk/Kconfig b/disk/Kconfig index 817b7c8c76d5..854969580746 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -51,7 +51,7 @@ config SPL_MAC_PARTITION config DOS_PARTITION bool "Enable MS Dos partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if x86 || CMD_FAT || USB_STORAGE select PARTITIONS help @@ -67,7 +67,7 @@ config SPL_DOS_PARTITION config ISO_PARTITION bool "Enable ISO partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if MIPS || ARCH_TEGRA select PARTITIONS @@ -91,7 +91,7 @@ config SPL_AMIGA_PARTITION config EFI_PARTITION bool "Enable EFI GPT partition table" - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if ARCH_TEGRA select PARTITIONS select LIB_UUID @@ -139,7 +139,7 @@ config SPL_EFI_PARTITION config PARTITION_UUIDS bool "Enable support of UUID for partition" depends on PARTITIONS - default y if DISTRO_DEFAULTS + default y if BOOT_DEFAULTS default y if EFI_PARTITION select LIB_UUID help