From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752766AbbJFP4x (ORCPT ); Tue, 6 Oct 2015 11:56:53 -0400 Received: from rcdn-iport-8.cisco.com ([173.37.86.79]:30483 "EHLO rcdn-iport-8.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517AbbJFP4s (ORCPT ); Tue, 6 Oct 2015 11:56:48 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0D9AQCH7BNW/4UNJK1egyeBQroChCIBDYFahhqBODgUAQEBAQEBAYEKhCd9gT4BEoguv1wBAQEBAQEBAwIBHwuGaIoLhDUFhziGRogGjReBV5Yog28fAQFCghEdgXQeM4g/AQEB X-IronPort-AV: E=Sophos;i="5.17,644,1437436800"; d="scan'208";a="33129283" From: Daniel Walker To: xe-kernel@external.cisco.com, Catalin Marinas , Will Deacon Cc: Daniel Walker , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH-RFC 7/7] arm64: convert to generic builtin command line Date: Tue, 6 Oct 2015 08:47:14 -0700 Message-Id: <1444146434-12776-7-git-send-email-danielwa@cisco.com> X-Mailer: git-send-email 2.1.4 X-Auto-Response-Suppress: DR, OOF, AutoReply Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This updates the arm64 code to use the CONFIG_GENERIC_CMDLINE option. Cc: xe-kernel@external.cisco.com Cc: Daniel Walker Signed-off-by: Daniel Walker --- arch/arm64/Kconfig | 17 +---------------- arch/arm64/kernel/setup.c | 3 +++ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 07d1811..a17226f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -89,6 +89,7 @@ config ARM64 select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select HAVE_CONTEXT_TRACKING + select GENERIC_CMDLINE help ARM 64-bit (AArch64) Linux support. @@ -625,22 +626,6 @@ endmenu menu "Boot options" -config CMDLINE - string "Default kernel command string" - default "" - help - Provide a set of default command-line options at build time by - entering them here. As a minimum, you should specify the the - root device (e.g. root=/dev/nfs). - -config CMDLINE_FORCE - bool "Always use the default kernel command string" - help - Always use the default kernel command string, even if the boot - loader passes other arguments to the kernel. - This is useful if you cannot or don't want to change the - command-line options your boot loader passes to the kernel. - config EFI_STUB bool diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 6bab21f..bb88102 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -418,6 +419,8 @@ void __init setup_arch(char **cmdline_p) setup_machine_fdt(__fdt_pointer); + cmdline_add_builtin(boot_command_line, NULL, COMMAND_LINE_SIZE); + parse_early_param(); /* -- 2.1.4