From patchwork Mon Oct 24 11:29:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9111 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp456121wru; Mon, 24 Oct 2022 06:33:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6QatZIf0pRNvFKqhvWS0PpOJvLZ9D5QZt0pYTHVUnA8X5EzDF6YjgZ3ZtCThEsZnvCVLy9 X-Received: by 2002:a17:90a:8048:b0:212:c605:522c with SMTP id e8-20020a17090a804800b00212c605522cmr22992772pjw.230.1666618416184; Mon, 24 Oct 2022 06:33:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666618416; cv=none; d=google.com; s=arc-20160816; b=CIcS6MMX4cr665dPypsaot5RRmESGTNRVpN7n8CdkqJG3PrzYX0qfzljZZ4rwrIzkH c0tK26XPWyXbi34OVKCv8L8RhcJysanH6olyHFV6xRuKcLh2BkKKDmnCEdjYq3X5qeft PFtBlAxxulSoUx1+S/3BHWPXSPHHwMqRqY5sgAK70e7VGmijfmmd0hQwQ2tKJAoD+wiL jXGDwdR93JX2J6xhjPC0M4VMVfWWYC2WaZotVvNg8DJfljnrjUudEZIORwSAl1vvwtq1 scRsQb0BVG2YhvOsYQxsB1pU6PK/FiHtwoPcLlw5Fb7fIL4AepTbxhOMifwWqWxsxRld F7WQ== 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=Byb42gpZlVX8Yga3BmLonMILyQwayyZsT+VelqRmwDk=; b=gnc1IN19JodNp0++HCpDIsEuGc6h/yEmnh2tHw8C1NVmLJBOHOdy2bQ93dU3WSxTdK 119uD065s7Zr0sMdjabtifMBa4fkrYrasRmR6zq0bEUsk3sf+pHZkZfKV9OjYWUcnVyN 5fKwSpxZC5LG3w3qzI4ADQdTDTT1+PBTxLG1mMbEUDVlarGuPrgTzKWwIwSvioqHlwi8 AeaU8pAjnrzhwMS9I8bE7++C8h9lwyqmOWibXe1cVqZdYil8ELy0UEV/s+b3/Y77cHZ2 ogld/SUSfosaMpxn0nitFG7CkIfU/utAb3+0oFz98vvL7MPpfBt0U+K35L8/M0WKkxhK X2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Hr78uM0c; 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 lx5-20020a17090b4b0500b00212e4f65e71si9432196pjb.31.2022.10.24.06.33.23; Mon, 24 Oct 2022 06:33:36 -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=Hr78uM0c; 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 S235896AbiJXNRh (ORCPT + 99 others); Mon, 24 Oct 2022 09:17:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233069AbiJXNRC (ORCPT ); Mon, 24 Oct 2022 09:17:02 -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 68F4C11A3D; Mon, 24 Oct 2022 05:26:05 -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 D79C361291; Mon, 24 Oct 2022 12:25:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEB7AC433D6; Mon, 24 Oct 2022 12:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614342; bh=qRVzc51V29E4b48Cb3aNElsbDhochs3vnq6JxPF0XQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hr78uM0clRFBmSFRlOL3YUBblI8GusnscDvJwJ1TP3cSoZgPNipyk55dcRVDnTmGH 3XrgM+a8kuI2M2X2w77qI8jaRgWffYD3rdikJqIowzSrD1urwwTh3xX5doIqv0kuhE CoI00LpH9dbvsFLNtJb2zlofWthEhUyIDrJ93ISI= 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.10 182/390] ARM: Drop CMDLINE_* dependency on ATAGS Date: Mon, 24 Oct 2022 13:29:39 +0200 Message-Id: <20221024113030.502841120@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747576072688854850?= X-GMAIL-MSGID: =?utf-8?q?1747576072688854850?= 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 b587ecc6f949..985ab0b091a6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1791,7 +1791,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"