mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -1302,6 +1302,17 @@ config CMDLINE
|
|
time by entering them here. As a minimum, you should specify the
|
|
memory size and the root device (e.g., mem=64M root=/dev/nfs).
|
|
|
|
+config CMDLINE_FORCE
|
|
+ bool "Always use the default kernel command string"
|
|
+ depends on CMDLINE != ""
|
|
+ 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.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
config XIP_KERNEL
|
|
bool "Kernel Execute-In-Place from ROM"
|
|
depends on !ZBOOT_ROM
|
|
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
|
|
index 621acad..655aba2 100644
|
|
--- a/arch/arm/kernel/setup.c
|
|
+++ b/arch/arm/kernel/setup.c
|
|
@@ -628,6 +628,7 @@ static int __init parse_tag_revision(const struct tag *tag)
|
|
|
|
__tagtable(ATAG_REVISION, parse_tag_revision);
|
|
|
|
+#ifndef CONFIG_CMDLINE_FORCE
|
|
static int __init parse_tag_cmdline(const struct tag *tag)
|
|
{
|
|
strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
|
|
@@ -635,6 +636,7 @@ static int __init parse_tag_cmdline(const struct tag *tag)
|
|
}
|
|
|
|
__tagtable(ATAG_CMDLINE, parse_tag_cmdline);
|
|
+#endif /* CONFIG_CMDLINE_FORCE */
|
|
|
|
/*
|
|
* Scan the tag table for this tag, and call its parse function.
|
|
--
|
|
1.6.4.4
|
|
|