Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp904086rwi; Wed, 19 Oct 2022 04:33:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4y1BmG4tc4dV6QWjvPC5PJKS5+YLyPDNp6Wn/vLphYdLTNCJVExK+UIIEr+bgfiEl7sd7Q X-Received: by 2002:a17:902:e88e:b0:183:dcb7:c4fc with SMTP id w14-20020a170902e88e00b00183dcb7c4fcmr7746767plg.32.1666179211546; Wed, 19 Oct 2022 04:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666179211; cv=none; d=google.com; s=arc-20160816; b=eql6wCUyCmuuXyM4IG0vPdtUwT0i7rQtFbw8AiOMtw7y0eBc36RBiMlZwly2UFS4cF XDa8gVgsJmJpfu0zXpQEtjnPxYpoAoMMpHc/tqThGNrpuV66hm46ZANrlCiYuJi3DHhc iX9HLCIF2AtxaJXV9onSnINhlT257lXYQ8hbTY9B6Y2uq7DO4IF3QZGb9OlEBy1kUG72 u4ull0jwkb+ykZv4Xw1PkhFRID8uHrXA5NPjSm2bLkSzBZiKYUrh206FAOyKhZcCmzQZ 9O7d86R2kcKyl1banuQIwGsNPZvrypIG3Bi0akVpUicQu0kD23mBB4DTmoep+wq9ati7 uKqQ== 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=jnEpAWdxJ9c4E9Tk4sOmtH6iY7VymqI6bZKr5pPtSsc=; b=UTNO5lEc4hWcTxgVYoy7mOB/CH8xoURFrEuA76EuTwSgg04NAhIDeC7IrZl6yznoTB leRDdNxjh4WwBcvsJnWsnoh0FWkYLHp8G1yArFtbDlN5jIVuzs2NhpVu5cI4BP2Lq0uL v3x8Vybmpv+JWrqJUXh3YSywNSHImcBYyAHZhxcGPIIJ5GRfdjubuU0Xph/WCe8yCInm rMAyizKZbntRbPK8/DT4Pr7qYBY1M6DCAQoSMTkR4Yaah9WKK/YDR8fAsGjH4FAn9zAV U688eJ+2Ba1rlMUcXUVNP9rCUvHvfjikw/evje+0N8Z2N6TNEliUv/fTrDpXybsoKT8D 63lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2Qe9AFgH; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h186-20020a636cc3000000b004403d4f1f6esi17310665pgc.458.2022.10.19.04.33.16; Wed, 19 Oct 2022 04:33:31 -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=2Qe9AFgH; 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 S232738AbiJSKpf (ORCPT + 99 others); Wed, 19 Oct 2022 06:45:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232709AbiJSKoD (ORCPT ); Wed, 19 Oct 2022 06:44:03 -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 D010D8E99B; Wed, 19 Oct 2022 03:20:58 -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 87FDBB82421; Wed, 19 Oct 2022 08:58:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09411C433D7; Wed, 19 Oct 2022 08:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169935; bh=nI9/PSB8ZlgVgtKWfWyJ/67XC9L26+kGdNPFlTXnO0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2Qe9AFgHCjzwnb4DaBeQlrVa0VJba+5gpRvScuDOkBhuw4tulr4/avHW765sIGmVE YLp1BAiw7wZWSrwfxNs8kSHu2Xw18DPp08edPqLXC3mk4V8PhoxOpTzrDxw/SrXcDt N/u0ksJGhaDEA7Sm7kIy+ji1kMl4Ow7VSgXpkkW4= 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 6.0 447/862] ARM: Drop CMDLINE_* dependency on ATAGS Date: Wed, 19 Oct 2022 10:28:54 +0200 Message-Id: <20221019083309.720138618@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.4 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 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 87badeae3181..11ecf09aadc8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1671,7 +1671,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" -- 2.35.1