From patchwork Mon Oct 24 11:30:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp440041wru; Mon, 24 Oct 2022 06:03:41 -0700 (PDT) X-Google-Smtp-Source: AMsMyM74ywI3xNRNSjsR8muShtwGECMJCdhdqJZwiLJ1szXzjfS+NKbFZTsQBbm8PQ+Zya420+QQ X-Received: by 2002:a05:6a00:1991:b0:565:9912:cbf7 with SMTP id d17-20020a056a00199100b005659912cbf7mr34090702pfl.59.1666616621201; Mon, 24 Oct 2022 06:03:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616621; cv=none; d=google.com; s=arc-20160816; b=EPzbenj1M7Z153YnUfXObsT+wXuxeuuFNyNlTXM/DCNjDPAsgN+y6DDgHlqQUJMmUx HuuhDavSAUMFuVFtno2jlJfR4eDDacaoDBUW0V2bojqaV8700CMt1uJsYHVvbM0MTj87 UzAIdrFk07RLdiwTO+Vbw87i/Ln/2L439Hi0IkrbFqKAFJTYVivygN4RQZ4x7wR8s3te 8i4GoYVzbMt2oKYs8ght6IRYYkLsMCA34Fxb45pW6OJ0xVbvQL6SzKuQJrvrA9apBPpR W1iy2UHa8+gQHwqfDCDVZpozil85V66dxgL+S1kNlNVqO1NP2TycaqvpIctUXhkHlZT9 5ooA== 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=jyKIGqVCpTMXngJyehl8+pam4p5+Z2n1cFhSkxcdpUo=; b=uYyhSjbDdx8oEnj+fpyGBDjT1WSCwQzkiX4uG+MNfLRpGPYvwcPU4Cq+EKREHuxCrc AZZNfD+X0iWI/MVrryM+ux/Cr4weW/NsDIwSHLyu4tMZrzoSVrW1ed4RctAT5e1gzRZY wePB3xr0nhBD2w59DYpe3BV6Wv5B3uSqAZgYFyWUxPz2tSj+svU53iEC9vtdqugUHrRS wiO5kE3f2flhbovifEo1Hqa7gBDh/sRxWnwjPOZZ0QDB+ZDj8lO6e/axyJOlCFbiDGCm nUo07t7P58oRZcXjTc7J+wWFrEypvVN3xV7hGVGS+rOVT1UkL7UCcpECsYCjmBXM8k41 kQuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LhjYbH4k; 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 u2-20020a170902e80200b00186a7d84c25si3800614plg.348.2022.10.24.06.03.00; Mon, 24 Oct 2022 06:03:41 -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=LhjYbH4k; 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 S235094AbiJXNCW (ORCPT + 99 others); Mon, 24 Oct 2022 09:02:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235157AbiJXM72 (ORCPT ); Mon, 24 Oct 2022 08:59:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5228A9AFA8; Mon, 24 Oct 2022 05:19:00 -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 6DD55612D1; Mon, 24 Oct 2022 12:01:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80299C433D6; Mon, 24 Oct 2022 12:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612885; bh=7IObXmTSTozYNo0nq8weVn+Qu4CRgbsAkxKHYjFBcOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LhjYbH4krzg+PefQ0d1mu9HQFAKrfi53oM0+n3Ka/2i1R1mOz3sd//8wee8F209Zn IWDGRsVkLWfT48/f4IhNAXYBE86ghblVJobmUQHFeUdBl9Hi2rWtOm6cQsgaEIKdrX IwM4fi68Z+u4rEuLSXsUJvEGfaUpFNYShUoZii2o= 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.19 115/229] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:30:34 +0200 Message-Id: <20221024113002.719052094@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747574190508822370?= X-GMAIL-MSGID: =?utf-8?q?1747574190508822370?= 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 fce7e85f3ef5..41bde0e62e90 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1943,7 +1943,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"