From patchwork Mon Oct 24 11:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8456 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp402540wru; Mon, 24 Oct 2022 04:50:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6YLz4W7mKGXm7gXv5Aa9+hXF1m5FRrjPyu9dEK1WPoi0EPt3k+dsznfMQuFRvUK44JU+E/ X-Received: by 2002:a17:90b:3b86:b0:20c:705a:dcdf with SMTP id pc6-20020a17090b3b8600b0020c705adcdfmr71535119pjb.205.1666612214087; Mon, 24 Oct 2022 04:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612214; cv=none; d=google.com; s=arc-20160816; b=Yg3JQvIlflSvS3JpH+tZdFPSaB7/rHmumYo6gPF0VslyYGsJvmD0IgHd3qmFaX1GXS b0DNCToCbQQq9aWquBz4tuwNHUG3qahtvQzEvhk2AxUdYuKcziPQ8JmoJsTuKzcPO9VR b7lXIl7bRIAajL+j7MyimtN3rltQNWdgAFEdgz9HsCaLlECX3Dnx/u5GSPmp722f/RNN oOtYOm3f/p46q+mVoGrZJU9ZMgVwlnQNsDcm1+HM7rY1wyQ+fMHJ7kTjJvsYoSx/qn2Y edc1Uqrj+k8YvKcnTx5FCDyGt9HloxHuJ0b6stvIfFhYIxwvIFVwRVeWnABZ169AzkEg fyZA== 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=eusjjfHnf5xaAHXj3zvweC9FTfbjZ+Qo7UKVJt6+z0o=; b=va8jWQX6sMJgkXV2DW2am6AfbGPCNpRFwd274a6ns9e62pn7iYUwUdy8wiM3HiZDxH H4jWgY+7mQK9fzEd0F/IGOD/e7Q4ctA2RoYLLgpa2xG568iOPVkT7A3aHGO59Z3hcBh1 GOpNbuo6Pr2XXOYFlyh/oTFsF4X+Xmb5MbjWKX0wpBGBtpd9JflHRZHLGkFWEmkRSyCc v7ABVyyjXPOUuZ7r3DCLxKL91EMb+glN7eB0yppn/vbTduVkjZC8mNjM0I3k7IusEW4/ epvxNfmjH40JXQGxIQ+kx6z0lfb99KuTGjgs0X8K9HvMHQhqbFoSNZMSIaeVlvHhui6l CADQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cbukvFCz; 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 kb10-20020a17090ae7ca00b00200a43d4d58si11008739pjb.80.2022.10.24.04.50.00; Mon, 24 Oct 2022 04:50:14 -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=cbukvFCz; 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 S231365AbiJXLtn (ORCPT + 99 others); Mon, 24 Oct 2022 07:49:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231640AbiJXLr4 (ORCPT ); Mon, 24 Oct 2022 07:47:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 041EB39113; Mon, 24 Oct 2022 04:43:25 -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 55BA9612A1; Mon, 24 Oct 2022 11:43:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 645E7C433C1; Mon, 24 Oct 2022 11:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611804; bh=XANlg89LU61ZOChVCr9nFWhOtkDHXvdO19qftwk0xXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cbukvFCzRaVz/ZBu6fvsXWBYXNH9LQsGxfXI298eNfU/AY6mn1By2vqaa1f26hDj4 nohhJQDSLGUt4ex4qKtdHypR9qqiIJwYQDXi9+9lCNMYc3Va6GdNyZm/7SEWUkc0LO 1N2AAda+1AaqG5gCIZz42BMPQ4z1Gj/75HaiXXRE= 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 4.9 087/159] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:30:41 +0200 Message-Id: <20221024112952.585102228@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569569006221731?= X-GMAIL-MSGID: =?utf-8?q?1747569569006221731?= 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 0429d1d20393..25eaf3775904 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1961,7 +1961,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"