From patchwork Mon Oct 24 11:30:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp422996wru; Mon, 24 Oct 2022 05:23:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Zhx/wwyO+Jyei8zcafcZknbX1TIjF1QNvLTgiq4SKZXw6tHuQlafdFihlx9ZiEPFZVnxS X-Received: by 2002:a50:85ca:0:b0:461:168c:83ab with SMTP id q10-20020a5085ca000000b00461168c83abmr19177259edh.359.1666614229387; Mon, 24 Oct 2022 05:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614229; cv=none; d=google.com; s=arc-20160816; b=MgJ/XwC962UoxHUzs06GqnhkmgfcVfYOXpxBAIj+v5NtO3vJaoxi/R6NDmjfCShqiy m9v1C3Kwm5rl2G9g/xEGCEWw7xnKGLSki0KyeX6VD1bYqlhWoycp/gh1ydySmUc3lrZS PikGjDBMXPXxzJvBo1p+BBdwHsqKfq1LVVQzGfa57UKSNUUi7YzghHKmfBhpWzuXqfRb LkK2ILxq397UYNSTJdXwmpP3OsXo+Riig6n+j1nzS+KEksdiYccpYRB0WhCNA2ec7rLl KdxN/cSEHogBWDjXJUVeeBYKQpEI7kc3yhGgNUfO7wAmYD6PqPRN3ZdDH4qE8tEJvJwL JDqA== 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=p3Yxex9J/ou2pbtXItIxt3p/+X5B9LO2CarwrwQAQwc=; b=d/YDV5hpl0cmEUVsE/I7AdSi6buV77lWLT9q0rw1MXbKh4sf0LdPIzhd+Ttdq/uOCt 6lyyng9fM+RfEcst1n2sV9mUNVlfecw2xcESjo4sX9gwd9TcgkuvGD/3NWlu0GOt1VEW O631GESeMc0LNlHGE+orIZFKWTZJY6CppcVCBANAIFltSXJaUPQicPmn1DMT4cjZoeKT z0lLwd9LcuLQarUqgFEasmauNM1+chZ1uv3M0aKVlluU9pGzaki94ZacI3+Q1aUVusp+ Ypb4UXaSRvt/z7LmFfb1b71++CWs2ygp0u7+6eiPnuq5NW2LR0iDmFoBFAYXRMPt+bEd vPYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P+rblkMD; 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 r24-20020aa7d158000000b004614db9083csi8513070edo.313.2022.10.24.05.23.23; Mon, 24 Oct 2022 05:23:49 -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=P+rblkMD; 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 S233508AbiJXMWg (ORCPT + 99 others); Mon, 24 Oct 2022 08:22:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233098AbiJXMUD (ORCPT ); Mon, 24 Oct 2022 08:20:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7914183223; Mon, 24 Oct 2022 04:58:56 -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 3292C612BF; Mon, 24 Oct 2022 11:50:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D8CEC433B5; Mon, 24 Oct 2022 11:50:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612210; bh=7mkua9TtQY1bbz8Pik2tYh3kVXMe/0nuNR7b/SAw73I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+rblkMD6kNZ2pXCylZ3C/eCTYB0K5ew7KxALelTiqRkFKhkCTsXySPqahR4Aw0g2 u03AEz5GzkGt+4ALtO8tec/eyJnBgsyyA9So2vsOO/oUu6wY1B0Ui7BcMh5Kd89AQs y0OtNqcuE8+qdwfi8R+4jdRsxT6y9wWTMW3FNP0g= 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.14 112/210] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:30:29 +0200 Message-Id: <20221024113000.635406550@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571681854940933?= X-GMAIL-MSGID: =?utf-8?q?1747571681854940933?= 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 3793642e0223..6fe7085cf7bd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1951,7 +1951,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"