From patchwork Mon Oct 24 11:30:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp554144wru; Mon, 24 Oct 2022 09:56:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5xgqMrhCquM+xEhoQcB4qQPWGF2cPDKwv5oq3HyJ/nxmTlcF8RJCNfELAa37oUHfySga1+ X-Received: by 2002:a63:8bc9:0:b0:45f:afa8:e686 with SMTP id j192-20020a638bc9000000b0045fafa8e686mr29086869pge.219.1666630582380; Mon, 24 Oct 2022 09:56:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630582; cv=none; d=google.com; s=arc-20160816; b=L3c+1mKqe4cjXP0I2WJH7uQF0Adhet3qIm0gTmU3KZcXu8rjLy/2MBWqp6c1D8Wq/L F1WwiIs9EJzy4UqZ0U1PZxSbkU/VvCfzDIsyXvb9MMWtc++jILM3I3TfQYNoELlyzb2D BqsEqpJXOeG1JTHr3JBwih7nyRiJ7yZV8q7+Pac0ltT6IoulbfKTRXbYdZleJPos6ARD OfFa8CPZV8f3IDWIdup3CtIkgnoBYKcEgBAtO3inQah/vvQhQxnsPjfI0+VaVbFZqTik 3MKmrMsooBNjFHcoTHAy5YzOK7PSgidLb+YqKaAhlrcmJF6A8I7Ui1QOG217c7NZUwTn Wixg== 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=8YvOtmN5B3GepiLv/8QD4yD49haGsIyfpSCcrjpNFp0=; b=0sHEmPSVqQhLjDrCAryI6+xz05Bdb4rbk4BoCYvhgpVNpP+LB9WqwYvtu1T7quPmla g95cK2JLtkHtzLGe9JaAEpktnQX8l9O4yGAXSw73JifNWvWe8A1E36ktUwin7moVMj5U SQK0pIYoc4uG0EJEpa97tm02cXjMDJvSVGtd2szc8dEa3vakPaIWi3oW7Bx0MPkHUx+6 wFGPrzZu1KzxlRrQacmruWdsRleo76bVs+RQmAHLQHS41eNadfpJ7mpVjk5jjXPIjnBX LI/ws/8b6/jpGiAzRbkOjb+5FBeEnE/UQDoNGXcwTs1+CTrEg/jl2rNnCmdDt6346uyf xKgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NPV8zVtN; 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 i2-20020a170902eb4200b0018685257c0csi21653pli.121.2022.10.24.09.56.07; Mon, 24 Oct 2022 09:56:22 -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=NPV8zVtN; 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 S234814AbiJXQsy (ORCPT + 99 others); Mon, 24 Oct 2022 12:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234936AbiJXQrM (ORCPT ); Mon, 24 Oct 2022 12:47:12 -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 3A9E2202727; Mon, 24 Oct 2022 08:31:44 -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 600EEB815A1; Mon, 24 Oct 2022 12:09:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A927EC433C1; Mon, 24 Oct 2022 12:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613385; bh=Ja7lCy50tCJE6mYG1SdXngoINi65jyCg6+IPCRVXcOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NPV8zVtNYSN7Ed+nN3rW3pJoRvC6QVPHAYJy4mCj7SOuM1jYfGBe/3hxia9FPjA+p mgZiVU+8MBuxQx8f/+u3kBs6fayP3/20goORHKT6aSfnvD/4QA4/D/J9dCaZQ5ccfg jJbFOrxDZWDeh8BcudzY2SXnZICdovzAald5T2ug= 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.4 116/255] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:30:26 +0200 Message-Id: <20221024113006.370145986@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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?1747588829626849684?= X-GMAIL-MSGID: =?utf-8?q?1747588829626849684?= 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 a4364cce85f8..a70696a95b79 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1837,7 +1837,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"