From patchwork Mon Oct 24 11:30:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp616370wru; Mon, 24 Oct 2022 12:28:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7pZOp8IqH8KOg1KV10pITkvj/PsmZHraMIx5ST3KhjWGKHOQSP77fsLoqIOwZ8oJQabpp1 X-Received: by 2002:a17:906:5dae:b0:78e:302f:4218 with SMTP id n14-20020a1709065dae00b0078e302f4218mr30146625ejv.22.1666639736347; Mon, 24 Oct 2022 12:28:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666639736; cv=none; d=google.com; s=arc-20160816; b=QwuLiy5Y7MwbUUumI6Q/FxPyQCXbOWYoFlCYgtMFgsvz9ubFr4CDx6jmmTJ7F08m08 JmwanVdnlBYt8Q0J9XPNbMU60PR3dHlColbShVhAz1LyJTJsByk5QN/+fcFI5AiApjR8 C5zNUw4RVauyDmH46uBzTMLjyE75aMFl1JrgmLmjBevwgwoPgVvvrjMEY6QopYfWGjZG YvNh3fUC+KuYekc7bdRYztiTYP+eedW7gy8Z0yNq6FM8Q7lgyelleXdP+1NYRKhRy60+ XPYoIDKQzXaAu0XpTSkGLX4lIsXNazxZo1pIJOVADhL5OI38CmQZoVBXMJMv+pXm492M xjmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IibwmqjIzkxfLXyHqdkW4ZwA0OBC+a7ccZZRy2pJ1Xw=; b=mibR35/MiOQM6mejyTvnTiYsUPZxzKr6p9LPIngcp59xitxvdhm2qJxmeCzlP5QFG0 Qz+45kc+jM3roB8JF8pbXD4Lwby7k0oF6jEEV2SzIbxPXswcPb44+InN3OI4ZqJ2t/dW nIBzB3oqA4dUjj4HRtwkW41c+4biggk9wiytHNt+r/RNuHOLIf/YbQS5bJ7jauKluB4i QqRn4KgWNKmj+YGk+cMVNzax+5iUbATYCofNCK74iXr2G1s4AQo+HdyEmdjQ/T1jnJJM QGrHAWKWiEMy8HM3zahCpKu4zM9bFGnuLsS/TUhj6+wJHK65LvKYzfk9HfcH1AaJYPCf dFUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ey5uZEM+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m18-20020a056402431200b0046187ab5c1bsi690987edc.512.2022.10.24.12.28.32; Mon, 24 Oct 2022 12:28:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ey5uZEM+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233190AbiJXT0R (ORCPT + 99 others); Mon, 24 Oct 2022 15:26:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233442AbiJXTYX (ORCPT ); Mon, 24 Oct 2022 15:24:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1508F1179; Mon, 24 Oct 2022 10:58:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E97706131B; Mon, 24 Oct 2022 12:46:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06250C433C1; Mon, 24 Oct 2022 12:46:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615565; bh=EmVK3Qn8bz+GFgNnk0q2lp2m3q1JR9qfV5VKrohEC9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ey5uZEM+Px/IxdYkZGM8PhgNZRyCj2rod+PltbnX4ZYEj41er4tib/HFdRivGEliC hjuGsyiG4TApNbxE6KiLwELSVygA38mWTp9vSFJBpqzBV3QFD6bB2i1FhNbvBJqyiL Petqqmnxlul+eA+0T2EROAmwEM51XQXz1gNKjOb4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Ard Biesheuvel , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.15 260/530] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:30:04 +0200 Message-Id: <20221024113056.827846548@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747598428221623615?= X-GMAIL-MSGID: =?utf-8?q?1747598428221623615?= From: Geert Uytterhoeven [ Upstream commit 136f4b1ec7c962ee37a787e095fd37b058d72bd3 ] On arm32, the configuration options to specify the kernel command line type depend on ATAGS. However, the actual CMDLINE cofiguration option does not depend on ATAGS, and the code that handles this is not specific to ATAGS (see drivers/of/fdt.c:early_init_dt_scan_chosen()). Hence users who desire to override the kernel command line on arm32 must enable support for ATAGS, even on a pure-DT system. Other architectures (arm64, loongarch, microblaze, nios2, powerpc, and riscv) do not impose such a restriction. Hence drop the dependency on ATAGS. Fixes: bd51e2f595580fb6 ("ARM: 7506/1: allow for ATAGS to be configured out when DT support is selected") Signed-off-by: Geert Uytterhoeven Acked-by: Ard Biesheuvel Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4ebd512043be..a8ae17f5740d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1741,7 +1741,6 @@ config CMDLINE choice prompt "Kernel command line type" if CMDLINE != "" default CMDLINE_FROM_BOOTLOADER - depends on ATAGS config CMDLINE_FROM_BOOTLOADER bool "Use bootloader kernel arguments if available"