Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3932206rwi; Sat, 22 Oct 2022 02:26:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM60k52PkuKOc76hf+aT1d/ShA4SZAHo6fyInjCHcfmGfgmbqE/K5shcaE1XQdAn2zthQ0H0 X-Received: by 2002:a05:6402:550e:b0:456:f79f:2bed with SMTP id fi14-20020a056402550e00b00456f79f2bedmr21766469edb.106.1666430802359; Sat, 22 Oct 2022 02:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666430802; cv=none; d=google.com; s=arc-20160816; b=p+sXIsPcf/ABkHpYFWdaPTI3MQ9Hf1XReIAYJja9NVLmIHMFpm9gKSlhsiA7iH9rj3 XV6sb85D8wd0uIazjLue86CYChl8EM51V16mp7faamB0p9WsiQFXtdMVNMLgxbj7QoKr GDswbEiogXvwFLrNEAuLe7916csG23nRx1lm388dL/jd6kqrzxyjQXmgPcSz3a3yemSf LZwk8WK73wqSLPpsOFzqIBThtk7MU1XqeHfTQGyDH8kpE/7g7yc8y2Tk5kly+8pYOhLU nIk577uEvNJbzDF4EzOywEv5020N2Kw+sglnMO8TkdyDUMjPIhTjFtVqPm8mmgYHQ6+o Hn1w== 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=7Ghtq5bbbwsmzPu6MUITrXPi/Fu7kLwFbKRmfXvCXk0=; b=CHd4YTCah/xwRttrOATLMHzPK8t6Ts8kIRvM2bXEtASb0dhqpS9zpj/OX07jlzBRzL Y3WLlo80ROmmaqNrfmHcUujp3PrI9E3tk+v00RZee+iUGb0i/GrmcoOq1ZAiH1ODQSSP ip5IzbzbEeusNu1TWUmtCLJSHcRqYBulkSrFL0peUGazRRp08kpEohkYizN3gxguunk4 aWv5/aboDw5l53i/W/yJI0fssV+jKi3PeXu4zobkwsRmwcXWlzGNFYurtXrtH0q757HX HLXiDg03Jwd0yKzNekVWFt/uOv6Qho4ymd9sY4srBDtm5ij3vGARmXU1zOAwSQYXTQtJ lRZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nmUo0hMw; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cs19-20020a170906dc9300b0072fb108db55si18398388ejc.895.2022.10.22.02.26.17; Sat, 22 Oct 2022 02:26:42 -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=nmUo0hMw; 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 S233362AbiJVIJi (ORCPT + 99 others); Sat, 22 Oct 2022 04:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232414AbiJVIFR (ORCPT ); Sat, 22 Oct 2022 04:05:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72D282D52DA; Sat, 22 Oct 2022 00:52:33 -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 ams.source.kernel.org (Postfix) with ESMTPS id 4BD11B82DFB; Sat, 22 Oct 2022 07:52:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83F68C433D6; Sat, 22 Oct 2022 07:51:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425120; bh=ecUngznMqnW5e4lWOlIz3hklrRoghLVGRnlS/7XReBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nmUo0hMwlMMUDdV0mXSJg1Es7ouuZnOFFKOGJ7JSPSqdzs3A9lJs7p/0mM8sZDK8m Ip1c6zghlSpz2n42tYhPPq4avGmaJf2orxomMypWV2/gpJiG1Ig2pC4sM7ghKIOpo9 sRnUtwKqczXc41rg00yIVU171npAeJmjHnHaM0Mk= 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.19 366/717] ARM: Drop CMDLINE_* dependency on ATAGS Date: Sat, 22 Oct 2022 09:24:05 +0200 Message-Id: <20221022072512.795041613@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.3 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 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 7630ba9cb6cc..ccc4706484d3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1653,7 +1653,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" -- 2.35.1