diff options
author | Dmitri Vorobiev <dmitri.vorobiev@movial.com> | 2009-11-21 15:34:41 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-12-16 20:57:35 -0500 |
commit | 6acc7d485c24c00e111c61b2e6dff9180faebcae (patch) | |
tree | 7c7519153775b20a87ff1a4745d16b0f1369861a /arch/mips | |
parent | de4148f3ef54b644a181ad75a6fb4b373f2b01f0 (diff) |
MIPS: Fix and enhance built-in kernel command line
Currently, MIPS kernels silently overwrite kernel command-line parameters
hardcoded in CONFIG_CMDLINE by the ones received from firmware. Therefore,
using firmware remains the only reliable method to transfer the
command-line parameters, which is not always desirable or convenient, and
the CONFIG_CMDLINE option is thereby effectively rendered useless.
This patch fixes the problem described above and introduces a more flexible
scheme of handling the kernel command line, in a manner identical to what is
currently used for x86. The default behavior, i.e. when CONFIG_CMDLINE_BOOL
is not defined, retains the existing semantics, and firmware command-line
arguments override the hardcoded ones.
[Ralf: I fixed up all the defconfig files so the stay unaffected by this
change.]
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/689/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
48 files changed, 123 insertions, 38 deletions
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug index 23817bc7a26..d2b88a0be51 100644 --- a/arch/mips/Kconfig.debug +++ b/arch/mips/Kconfig.debug | |||
@@ -20,15 +20,52 @@ config EARLY_PRINTK | |||
20 | doesn't cooperate with an X server. You should normally say N here, | 20 | doesn't cooperate with an X server. You should normally say N here, |
21 | unless you want to debug such a crash. | 21 | unless you want to debug such a crash. |
22 | 22 | ||
23 | config CMDLINE_BOOL | ||
24 | bool "Built-in kernel command line" | ||
25 | default n | ||
26 | help | ||
27 | For most systems, it is firmware or second stage bootloader that | ||
28 | by default specifies the kernel command line options. However, | ||
29 | it might be necessary or advantageous to either override the | ||
30 | default kernel command line or add a few extra options to it. | ||
31 | For such cases, this option allows you to hardcode your own | ||
32 | command line options directly into the kernel. For that, you | ||
33 | should choose 'Y' here, and fill in the extra boot arguments | ||
34 | in CONFIG_CMDLINE. | ||
35 | |||
36 | The built-in options will be concatenated to the default command | ||
37 | line if CMDLINE_OVERRIDE is set to 'N'. Otherwise, the default | ||
38 | command line will be ignored and replaced by the built-in string. | ||
39 | |||
40 | Most MIPS systems will normally expect 'N' here and rely upon | ||
41 | the command line from the firmware or the second-stage bootloader. | ||
42 | |||
23 | config CMDLINE | 43 | config CMDLINE |
24 | string "Default kernel command string" | 44 | string "Default kernel command string" |
45 | depends on CMDLINE_BOOL | ||
25 | default "" | 46 | default "" |
26 | help | 47 | help |
27 | On some platforms, there is currently no way for the boot loader to | 48 | On some platforms, there is currently no way for the boot loader to |
28 | pass arguments to the kernel. For these platforms, you can supply | 49 | pass arguments to the kernel. For these platforms, and for the cases |
29 | some command-line options at build time by entering them here. In | 50 | when you want to add some extra options to the command line or ignore |
30 | other cases you can specify kernel args so that you don't have | 51 | the default command line, you can supply some command-line options at |
31 | to set them up in board prom initialization routines. | 52 | build time by entering them here. In other cases you can specify |
53 | kernel args so that you don't have to set them up in board prom | ||
54 | initialization routines. | ||
55 | |||
56 | For more information, see the CMDLINE_BOOL and CMDLINE_OVERRIDE | ||
57 | options. | ||
58 | |||
59 | config CMDLINE_OVERRIDE | ||
60 | bool "Built-in command line overrides firware arguments" | ||
61 | default n | ||
62 | depends on CMDLINE_BOOL | ||
63 | help | ||
64 | By setting this option to 'Y' you will have your kernel ignore | ||
65 | command line arguments from firmware or second stage bootloader. | ||
66 | Instead, the built-in command line will be used exclusively. | ||
67 | |||
68 | Normally, you will choose 'N' here. | ||
32 | 69 | ||
33 | config DEBUG_STACK_USAGE | 70 | config DEBUG_STACK_USAGE |
34 | bool "Enable stack utilization instrumentation" | 71 | bool "Enable stack utilization instrumentation" |
diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig index 1d5ec3c11c7..5a5b6ba7514 100644 --- a/arch/mips/configs/ar7_defconfig +++ b/arch/mips/configs/ar7_defconfig | |||
@@ -1051,7 +1051,9 @@ CONFIG_TRACING_SUPPORT=y | |||
1051 | # CONFIG_DYNAMIC_DEBUG is not set | 1051 | # CONFIG_DYNAMIC_DEBUG is not set |
1052 | # CONFIG_SAMPLES is not set | 1052 | # CONFIG_SAMPLES is not set |
1053 | CONFIG_HAVE_ARCH_KGDB=y | 1053 | CONFIG_HAVE_ARCH_KGDB=y |
1054 | CONFIG_CMDLINE_BOOL=y | ||
1054 | CONFIG_CMDLINE="rootfstype=squashfs,jffs2" | 1055 | CONFIG_CMDLINE="rootfstype=squashfs,jffs2" |
1056 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1055 | 1057 | ||
1056 | # | 1058 | # |
1057 | # Security options | 1059 | # Security options |
diff --git a/arch/mips/configs/bcm47xx_defconfig b/arch/mips/configs/bcm47xx_defconfig index 8715de1d809..267bd46120b 100644 --- a/arch/mips/configs/bcm47xx_defconfig +++ b/arch/mips/configs/bcm47xx_defconfig | |||
@@ -1852,7 +1852,7 @@ CONFIG_DEBUG_FS=y | |||
1852 | # CONFIG_HEADERS_CHECK is not set | 1852 | # CONFIG_HEADERS_CHECK is not set |
1853 | # CONFIG_DEBUG_KERNEL is not set | 1853 | # CONFIG_DEBUG_KERNEL is not set |
1854 | # CONFIG_SAMPLES is not set | 1854 | # CONFIG_SAMPLES is not set |
1855 | CONFIG_CMDLINE="" | 1855 | # CONFIG_CMDLINE_BOOL is not set |
1856 | 1856 | ||
1857 | # | 1857 | # |
1858 | # Security options | 1858 | # Security options |
diff --git a/arch/mips/configs/bcm63xx_defconfig b/arch/mips/configs/bcm63xx_defconfig index efa65982239..7fee0273c82 100644 --- a/arch/mips/configs/bcm63xx_defconfig +++ b/arch/mips/configs/bcm63xx_defconfig | |||
@@ -941,7 +941,9 @@ CONFIG_TRACING_SUPPORT=y | |||
941 | # CONFIG_BLK_DEV_IO_TRACE is not set | 941 | # CONFIG_BLK_DEV_IO_TRACE is not set |
942 | # CONFIG_SAMPLES is not set | 942 | # CONFIG_SAMPLES is not set |
943 | CONFIG_HAVE_ARCH_KGDB=y | 943 | CONFIG_HAVE_ARCH_KGDB=y |
944 | CONFIG_CMDLINE_BOOL=y | ||
944 | CONFIG_CMDLINE="console=ttyS0,115200" | 945 | CONFIG_CMDLINE="console=ttyS0,115200" |
946 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
945 | 947 | ||
946 | # | 948 | # |
947 | # Security options | 949 | # Security options |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 1f0228d6f16..c2f06e38c85 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -1236,7 +1236,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
1236 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1236 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1237 | # CONFIG_FAULT_INJECTION is not set | 1237 | # CONFIG_FAULT_INJECTION is not set |
1238 | # CONFIG_SAMPLES is not set | 1238 | # CONFIG_SAMPLES is not set |
1239 | CONFIG_CMDLINE="" | 1239 | # CONFIG_CMDLINE_BOOL is not set |
1240 | # CONFIG_DEBUG_STACK_USAGE is not set | 1240 | # CONFIG_DEBUG_STACK_USAGE is not set |
1241 | # CONFIG_SB1XXX_CORELIS is not set | 1241 | # CONFIG_SB1XXX_CORELIS is not set |
1242 | # CONFIG_RUNTIME_DEBUG is not set | 1242 | # CONFIG_RUNTIME_DEBUG is not set |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index be81bf68e17..72b7e456916 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
@@ -782,7 +782,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
782 | # CONFIG_HEADERS_CHECK is not set | 782 | # CONFIG_HEADERS_CHECK is not set |
783 | # CONFIG_DEBUG_KERNEL is not set | 783 | # CONFIG_DEBUG_KERNEL is not set |
784 | CONFIG_CROSSCOMPILE=y | 784 | CONFIG_CROSSCOMPILE=y |
785 | CONFIG_CMDLINE_BOOL=y | ||
785 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" | 786 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" |
787 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
786 | 788 | ||
787 | # | 789 | # |
788 | # Security options | 790 | # Security options |
diff --git a/arch/mips/configs/cavium-octeon_defconfig b/arch/mips/configs/cavium-octeon_defconfig index 22819d9c683..c8507bc8e92 100644 --- a/arch/mips/configs/cavium-octeon_defconfig +++ b/arch/mips/configs/cavium-octeon_defconfig | |||
@@ -820,7 +820,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
820 | # CONFIG_SAMPLES is not set | 820 | # CONFIG_SAMPLES is not set |
821 | CONFIG_HAVE_ARCH_KGDB=y | 821 | CONFIG_HAVE_ARCH_KGDB=y |
822 | # CONFIG_KGDB is not set | 822 | # CONFIG_KGDB is not set |
823 | CONFIG_CMDLINE="" | 823 | # CONFIG_CMDLINE_BOOL is not set |
824 | # CONFIG_DEBUG_STACK_USAGE is not set | 824 | # CONFIG_DEBUG_STACK_USAGE is not set |
825 | # CONFIG_RUNTIME_DEBUG is not set | 825 | # CONFIG_RUNTIME_DEBUG is not set |
826 | 826 | ||
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index b1502869378..49e61312e00 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
@@ -1125,7 +1125,7 @@ CONFIG_FRAME_WARN=1024 | |||
1125 | # CONFIG_SLUB_STATS is not set | 1125 | # CONFIG_SLUB_STATS is not set |
1126 | # CONFIG_DEBUG_MEMORY_INIT is not set | 1126 | # CONFIG_DEBUG_MEMORY_INIT is not set |
1127 | # CONFIG_SAMPLES is not set | 1127 | # CONFIG_SAMPLES is not set |
1128 | CONFIG_CMDLINE="" | 1128 | # CONFIG_CMDLINE_BOOL is not set |
1129 | 1129 | ||
1130 | # | 1130 | # |
1131 | # Security options | 1131 | # Security options |
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 63cdea20291..68e90cd6b2d 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
@@ -1089,7 +1089,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1089 | # CONFIG_DEBUG_KERNEL is not set | 1089 | # CONFIG_DEBUG_KERNEL is not set |
1090 | CONFIG_LOG_BUF_SHIFT=14 | 1090 | CONFIG_LOG_BUF_SHIFT=14 |
1091 | CONFIG_CROSSCOMPILE=y | 1091 | CONFIG_CROSSCOMPILE=y |
1092 | CONFIG_CMDLINE="" | 1092 | # CONFIG_CMDLINE_BOOL is not set |
1093 | 1093 | ||
1094 | # | 1094 | # |
1095 | # Security options | 1095 | # Security options |
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 7ae0f9a1704..90812830e94 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
@@ -1089,7 +1089,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1089 | # CONFIG_DEBUG_KERNEL is not set | 1089 | # CONFIG_DEBUG_KERNEL is not set |
1090 | CONFIG_LOG_BUF_SHIFT=14 | 1090 | CONFIG_LOG_BUF_SHIFT=14 |
1091 | CONFIG_CROSSCOMPILE=y | 1091 | CONFIG_CROSSCOMPILE=y |
1092 | CONFIG_CMDLINE="" | 1092 | # CONFIG_CMDLINE_BOOL is not set |
1093 | 1093 | ||
1094 | # | 1094 | # |
1095 | # Security options | 1095 | # Security options |
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig index a6d9e1f48bb..dabf03032e0 100644 --- a/arch/mips/configs/db1200_defconfig +++ b/arch/mips/configs/db1200_defconfig | |||
@@ -1171,7 +1171,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1171 | # CONFIG_DEBUG_KERNEL is not set | 1171 | # CONFIG_DEBUG_KERNEL is not set |
1172 | CONFIG_LOG_BUF_SHIFT=14 | 1172 | CONFIG_LOG_BUF_SHIFT=14 |
1173 | CONFIG_CROSSCOMPILE=y | 1173 | CONFIG_CROSSCOMPILE=y |
1174 | CONFIG_CMDLINE_BOOL=y | ||
1174 | CONFIG_CMDLINE="mem=48M" | 1175 | CONFIG_CMDLINE="mem=48M" |
1176 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1175 | 1177 | ||
1176 | # | 1178 | # |
1177 | # Security options | 1179 | # Security options |
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig index a3a462b1f4e..a1513137313 100644 --- a/arch/mips/configs/db1500_defconfig +++ b/arch/mips/configs/db1500_defconfig | |||
@@ -1389,7 +1389,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1389 | # CONFIG_DEBUG_KERNEL is not set | 1389 | # CONFIG_DEBUG_KERNEL is not set |
1390 | CONFIG_LOG_BUF_SHIFT=14 | 1390 | CONFIG_LOG_BUF_SHIFT=14 |
1391 | CONFIG_CROSSCOMPILE=y | 1391 | CONFIG_CROSSCOMPILE=y |
1392 | CONFIG_CMDLINE="" | 1392 | # CONFIG_CMDLINE_BOOL is not set |
1393 | 1393 | ||
1394 | # | 1394 | # |
1395 | # Security options | 1395 | # Security options |
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig index bfc962ed35b..6b64339c001 100644 --- a/arch/mips/configs/db1550_defconfig +++ b/arch/mips/configs/db1550_defconfig | |||
@@ -1206,7 +1206,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1206 | # CONFIG_DEBUG_KERNEL is not set | 1206 | # CONFIG_DEBUG_KERNEL is not set |
1207 | CONFIG_LOG_BUF_SHIFT=14 | 1207 | CONFIG_LOG_BUF_SHIFT=14 |
1208 | CONFIG_CROSSCOMPILE=y | 1208 | CONFIG_CROSSCOMPILE=y |
1209 | CONFIG_CMDLINE="" | 1209 | # CONFIG_CMDLINE_BOOL is not set |
1210 | 1210 | ||
1211 | # | 1211 | # |
1212 | # Security options | 1212 | # Security options |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 7eb6d1b4e32..cbb4d86f291 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
@@ -881,7 +881,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
881 | # CONFIG_DEBUG_KERNEL is not set | 881 | # CONFIG_DEBUG_KERNEL is not set |
882 | CONFIG_LOG_BUF_SHIFT=14 | 882 | CONFIG_LOG_BUF_SHIFT=14 |
883 | CONFIG_CROSSCOMPILE=y | 883 | CONFIG_CROSSCOMPILE=y |
884 | CONFIG_CMDLINE="" | 884 | # CONFIG_CMDLINE_BOOL is not set |
885 | 885 | ||
886 | # | 886 | # |
887 | # Security options | 887 | # Security options |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index c6b1d6b29df..52968c46c80 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
@@ -560,7 +560,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
560 | # CONFIG_HEADERS_CHECK is not set | 560 | # CONFIG_HEADERS_CHECK is not set |
561 | # CONFIG_DEBUG_KERNEL is not set | 561 | # CONFIG_DEBUG_KERNEL is not set |
562 | CONFIG_CROSSCOMPILE=y | 562 | CONFIG_CROSSCOMPILE=y |
563 | CONFIG_CMDLINE_BOOL=y | ||
563 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" | 564 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" |
565 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
564 | 566 | ||
565 | # | 567 | # |
566 | # Security options | 568 | # Security options |
diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig index 17341a0b469..a09dd03aa8c 100644 --- a/arch/mips/configs/fuloong2e_defconfig +++ b/arch/mips/configs/fuloong2e_defconfig | |||
@@ -1710,7 +1710,7 @@ CONFIG_TRACING_SUPPORT=y | |||
1710 | # CONFIG_DYNAMIC_DEBUG is not set | 1710 | # CONFIG_DYNAMIC_DEBUG is not set |
1711 | # CONFIG_SAMPLES is not set | 1711 | # CONFIG_SAMPLES is not set |
1712 | CONFIG_HAVE_ARCH_KGDB=y | 1712 | CONFIG_HAVE_ARCH_KGDB=y |
1713 | CONFIG_CMDLINE="" | 1713 | # CONFIG_CMDLINE_BOOL is not set |
1714 | 1714 | ||
1715 | # | 1715 | # |
1716 | # Security options | 1716 | # Security options |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 3471ac9ab9d..222d7eca2fe 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -1187,7 +1187,7 @@ CONFIG_DEBUG_MEMORY_INIT=y | |||
1187 | CONFIG_DYNAMIC_PRINTK_DEBUG=y | 1187 | CONFIG_DYNAMIC_PRINTK_DEBUG=y |
1188 | # CONFIG_SAMPLES is not set | 1188 | # CONFIG_SAMPLES is not set |
1189 | CONFIG_HAVE_ARCH_KGDB=y | 1189 | CONFIG_HAVE_ARCH_KGDB=y |
1190 | CONFIG_CMDLINE="" | 1190 | # CONFIG_CMDLINE_BOOL is not set |
1191 | 1191 | ||
1192 | # | 1192 | # |
1193 | # Security options | 1193 | # Security options |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 26127a8dd25..ed84b4cb3c8 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -939,7 +939,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
939 | # CONFIG_HEADERS_CHECK is not set | 939 | # CONFIG_HEADERS_CHECK is not set |
940 | # CONFIG_DEBUG_KERNEL is not set | 940 | # CONFIG_DEBUG_KERNEL is not set |
941 | CONFIG_CROSSCOMPILE=y | 941 | CONFIG_CROSSCOMPILE=y |
942 | CONFIG_CMDLINE="" | 942 | # CONFIG_CMDLINE_BOOL is not set |
943 | 943 | ||
944 | # | 944 | # |
945 | # Security options | 945 | # Security options |
diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig index ac6c850957f..dab2e5aaada 100644 --- a/arch/mips/configs/ip28_defconfig +++ b/arch/mips/configs/ip28_defconfig | |||
@@ -815,7 +815,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
815 | # CONFIG_HEADERS_CHECK is not set | 815 | # CONFIG_HEADERS_CHECK is not set |
816 | # CONFIG_DEBUG_KERNEL is not set | 816 | # CONFIG_DEBUG_KERNEL is not set |
817 | # CONFIG_SAMPLES is not set | 817 | # CONFIG_SAMPLES is not set |
818 | CONFIG_CMDLINE="" | 818 | # CONFIG_CMDLINE_BOOL is not set |
819 | 819 | ||
820 | # | 820 | # |
821 | # Security options | 821 | # Security options |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 56553b1a821..1841c88d3d2 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -1125,7 +1125,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
1125 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1125 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1126 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
1127 | CONFIG_HAVE_ARCH_KGDB=y | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
1128 | CONFIG_CMDLINE="" | 1128 | # CONFIG_CMDLINE_BOOL is not set |
1129 | 1129 | ||
1130 | # | 1130 | # |
1131 | # Security options | 1131 | # Security options |
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig index 9db23fdffd9..14c2ab3b267 100644 --- a/arch/mips/configs/jazz_defconfig +++ b/arch/mips/configs/jazz_defconfig | |||
@@ -1373,7 +1373,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1373 | # CONFIG_DEBUG_KERNEL is not set | 1373 | # CONFIG_DEBUG_KERNEL is not set |
1374 | CONFIG_LOG_BUF_SHIFT=14 | 1374 | CONFIG_LOG_BUF_SHIFT=14 |
1375 | CONFIG_CROSSCOMPILE=y | 1375 | CONFIG_CROSSCOMPILE=y |
1376 | CONFIG_CMDLINE="" | 1376 | # CONFIG_CMDLINE_BOOL is not set |
1377 | 1377 | ||
1378 | # | 1378 | # |
1379 | # Security options | 1379 | # Security options |
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 11fec0e8a79..4d66c44cced 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
@@ -834,7 +834,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y | |||
834 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 834 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
835 | # CONFIG_SAMPLES is not set | 835 | # CONFIG_SAMPLES is not set |
836 | CONFIG_HAVE_ARCH_KGDB=y | 836 | CONFIG_HAVE_ARCH_KGDB=y |
837 | CONFIG_CMDLINE="" | 837 | # CONFIG_CMDLINE_BOOL is not set |
838 | 838 | ||
839 | # | 839 | # |
840 | # Security options | 840 | # Security options |
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig index 2fe15a5bfed..08d481e3d42 100644 --- a/arch/mips/configs/lasat_defconfig +++ b/arch/mips/configs/lasat_defconfig | |||
@@ -797,7 +797,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
797 | # CONFIG_HEADERS_CHECK is not set | 797 | # CONFIG_HEADERS_CHECK is not set |
798 | # CONFIG_DEBUG_KERNEL is not set | 798 | # CONFIG_DEBUG_KERNEL is not set |
799 | CONFIG_CROSSCOMPILE=y | 799 | CONFIG_CROSSCOMPILE=y |
800 | CONFIG_CMDLINE="" | 800 | # CONFIG_CMDLINE_BOOL is not set |
801 | 801 | ||
802 | # | 802 | # |
803 | # Security options | 803 | # Security options |
diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index ddb1c92b6f0..b71a0a4fb95 100644 --- a/arch/mips/configs/lemote2f_defconfig +++ b/arch/mips/configs/lemote2f_defconfig | |||
@@ -1707,7 +1707,7 @@ CONFIG_TRACING_SUPPORT=y | |||
1707 | # CONFIG_FTRACE is not set | 1707 | # CONFIG_FTRACE is not set |
1708 | # CONFIG_SAMPLES is not set | 1708 | # CONFIG_SAMPLES is not set |
1709 | CONFIG_HAVE_ARCH_KGDB=y | 1709 | CONFIG_HAVE_ARCH_KGDB=y |
1710 | CONFIG_CMDLINE="" | 1710 | # CONFIG_CMDLINE_BOOL is not set |
1711 | 1711 | ||
1712 | # | 1712 | # |
1713 | # Security options | 1713 | # Security options |
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 38d98739b16..d3c601206db 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -1590,7 +1590,7 @@ CONFIG_FRAME_WARN=1024 | |||
1590 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | 1590 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set |
1591 | # CONFIG_SAMPLES is not set | 1591 | # CONFIG_SAMPLES is not set |
1592 | CONFIG_HAVE_ARCH_KGDB=y | 1592 | CONFIG_HAVE_ARCH_KGDB=y |
1593 | CONFIG_CMDLINE="" | 1593 | # CONFIG_CMDLINE_BOOL is not set |
1594 | 1594 | ||
1595 | # | 1595 | # |
1596 | # Security options | 1596 | # Security options |
diff --git a/arch/mips/configs/markeins_defconfig b/arch/mips/configs/markeins_defconfig index 91375718082..6a325c02b63 100644 --- a/arch/mips/configs/markeins_defconfig +++ b/arch/mips/configs/markeins_defconfig | |||
@@ -1365,7 +1365,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1365 | # CONFIG_DEBUG_KERNEL is not set | 1365 | # CONFIG_DEBUG_KERNEL is not set |
1366 | CONFIG_LOG_BUF_SHIFT=14 | 1366 | CONFIG_LOG_BUF_SHIFT=14 |
1367 | CONFIG_CROSSCOMPILE=y | 1367 | CONFIG_CROSSCOMPILE=y |
1368 | CONFIG_CMDLINE_BOOL=y | ||
1368 | CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw" | 1369 | CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw" |
1370 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1369 | 1371 | ||
1370 | # | 1372 | # |
1371 | # Security options | 1373 | # Security options |
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig index 513e9a416fe..f77a34e0f93 100644 --- a/arch/mips/configs/mipssim_defconfig +++ b/arch/mips/configs/mipssim_defconfig | |||
@@ -634,7 +634,9 @@ CONFIG_FORCED_INLINING=y | |||
634 | # CONFIG_RCU_TORTURE_TEST is not set | 634 | # CONFIG_RCU_TORTURE_TEST is not set |
635 | # CONFIG_FAULT_INJECTION is not set | 635 | # CONFIG_FAULT_INJECTION is not set |
636 | CONFIG_CROSSCOMPILE=y | 636 | CONFIG_CROSSCOMPILE=y |
637 | CONFIG_CMDLINE_BOOL=y | ||
637 | CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" | 638 | CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" |
639 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
638 | # CONFIG_DEBUG_STACK_USAGE is not set | 640 | # CONFIG_DEBUG_STACK_USAGE is not set |
639 | # CONFIG_RUNTIME_DEBUG is not set | 641 | # CONFIG_RUNTIME_DEBUG is not set |
640 | 642 | ||
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index b893f9d1379..17203056b22 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
@@ -816,7 +816,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
816 | # CONFIG_HEADERS_CHECK is not set | 816 | # CONFIG_HEADERS_CHECK is not set |
817 | # CONFIG_DEBUG_KERNEL is not set | 817 | # CONFIG_DEBUG_KERNEL is not set |
818 | CONFIG_CROSSCOMPILE=y | 818 | CONFIG_CROSSCOMPILE=y |
819 | CONFIG_CMDLINE_BOOL=y | ||
819 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" | 820 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" |
821 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
820 | 822 | ||
821 | # | 823 | # |
822 | # Security options | 824 | # Security options |
diff --git a/arch/mips/configs/msp71xx_defconfig b/arch/mips/configs/msp71xx_defconfig index 89d2b6a9475..000d185ddf4 100644 --- a/arch/mips/configs/msp71xx_defconfig +++ b/arch/mips/configs/msp71xx_defconfig | |||
@@ -1411,7 +1411,7 @@ CONFIG_FORCED_INLINING=y | |||
1411 | # CONFIG_RCU_TORTURE_TEST is not set | 1411 | # CONFIG_RCU_TORTURE_TEST is not set |
1412 | # CONFIG_FAULT_INJECTION is not set | 1412 | # CONFIG_FAULT_INJECTION is not set |
1413 | CONFIG_CROSSCOMPILE=y | 1413 | CONFIG_CROSSCOMPILE=y |
1414 | CONFIG_CMDLINE="" | 1414 | # CONFIG_CMDLINE_BOOL is not set |
1415 | # CONFIG_DEBUG_STACK_USAGE is not set | 1415 | # CONFIG_DEBUG_STACK_USAGE is not set |
1416 | # CONFIG_RUNTIME_DEBUG is not set | 1416 | # CONFIG_RUNTIME_DEBUG is not set |
1417 | # CONFIG_MIPS_UNCACHED is not set | 1417 | # CONFIG_MIPS_UNCACHED is not set |
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index 31996689855..144b94d9a6a 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
@@ -3017,7 +3017,7 @@ CONFIG_MAGIC_SYSRQ=y | |||
3017 | # CONFIG_HEADERS_CHECK is not set | 3017 | # CONFIG_HEADERS_CHECK is not set |
3018 | # CONFIG_DEBUG_KERNEL is not set | 3018 | # CONFIG_DEBUG_KERNEL is not set |
3019 | CONFIG_CROSSCOMPILE=y | 3019 | CONFIG_CROSSCOMPILE=y |
3020 | CONFIG_CMDLINE="" | 3020 | # CONFIG_CMDLINE_BOOL is not set |
3021 | 3021 | ||
3022 | # | 3022 | # |
3023 | # Security options | 3023 | # Security options |
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index c36e859ad81..ddf67f63919 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
@@ -1082,7 +1082,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1082 | # CONFIG_DEBUG_KERNEL is not set | 1082 | # CONFIG_DEBUG_KERNEL is not set |
1083 | CONFIG_LOG_BUF_SHIFT=14 | 1083 | CONFIG_LOG_BUF_SHIFT=14 |
1084 | CONFIG_CROSSCOMPILE=y | 1084 | CONFIG_CROSSCOMPILE=y |
1085 | CONFIG_CMDLINE="" | 1085 | # CONFIG_CMDLINE_BOOL is not set |
1086 | 1086 | ||
1087 | # | 1087 | # |
1088 | # Security options | 1088 | # Security options |
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig index 4b43e36fa1f..5ec60836b64 100644 --- a/arch/mips/configs/pb1500_defconfig +++ b/arch/mips/configs/pb1500_defconfig | |||
@@ -1199,7 +1199,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1199 | # CONFIG_DEBUG_KERNEL is not set | 1199 | # CONFIG_DEBUG_KERNEL is not set |
1200 | CONFIG_LOG_BUF_SHIFT=14 | 1200 | CONFIG_LOG_BUF_SHIFT=14 |
1201 | CONFIG_CROSSCOMPILE=y | 1201 | CONFIG_CROSSCOMPILE=y |
1202 | CONFIG_CMDLINE="" | 1202 | # CONFIG_CMDLINE_BOOL is not set |
1203 | 1203 | ||
1204 | # | 1204 | # |
1205 | # Security options | 1205 | # Security options |
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig index 7c8d351ad1c..6647642b5d9 100644 --- a/arch/mips/configs/pb1550_defconfig +++ b/arch/mips/configs/pb1550_defconfig | |||
@@ -1192,7 +1192,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1192 | # CONFIG_DEBUG_KERNEL is not set | 1192 | # CONFIG_DEBUG_KERNEL is not set |
1193 | CONFIG_LOG_BUF_SHIFT=14 | 1193 | CONFIG_LOG_BUF_SHIFT=14 |
1194 | CONFIG_CROSSCOMPILE=y | 1194 | CONFIG_CROSSCOMPILE=y |
1195 | CONFIG_CMDLINE="" | 1195 | # CONFIG_CMDLINE_BOOL is not set |
1196 | 1196 | ||
1197 | # | 1197 | # |
1198 | # Security options | 1198 | # Security options |
diff --git a/arch/mips/configs/pnx8335-stb225_defconfig b/arch/mips/configs/pnx8335-stb225_defconfig index 77a75f01197..848344d588d 100644 --- a/arch/mips/configs/pnx8335-stb225_defconfig +++ b/arch/mips/configs/pnx8335-stb225_defconfig | |||
@@ -1033,7 +1033,7 @@ CONFIG_FRAME_WARN=1024 | |||
1033 | # CONFIG_DEBUG_KERNEL is not set | 1033 | # CONFIG_DEBUG_KERNEL is not set |
1034 | # CONFIG_SAMPLES is not set | 1034 | # CONFIG_SAMPLES is not set |
1035 | # CONFIG_KERNEL_TESTS is not set | 1035 | # CONFIG_KERNEL_TESTS is not set |
1036 | CONFIG_CMDLINE="" | 1036 | # CONFIG_CMDLINE_BOOL is not set |
1037 | 1037 | ||
1038 | # | 1038 | # |
1039 | # Security options | 1039 | # Security options |
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig index 945b27e1332..9d721fdccb3 100644 --- a/arch/mips/configs/pnx8550-jbs_defconfig +++ b/arch/mips/configs/pnx8550-jbs_defconfig | |||
@@ -1214,7 +1214,9 @@ CONFIG_DEBUG_MUTEXES=y | |||
1214 | CONFIG_FORCED_INLINING=y | 1214 | CONFIG_FORCED_INLINING=y |
1215 | # CONFIG_RCU_TORTURE_TEST is not set | 1215 | # CONFIG_RCU_TORTURE_TEST is not set |
1216 | CONFIG_CROSSCOMPILE=y | 1216 | CONFIG_CROSSCOMPILE=y |
1217 | CONFIG_CMDLINE_BOOL=y | ||
1217 | CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp" | 1218 | CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp" |
1219 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1218 | # CONFIG_DEBUG_STACK_USAGE is not set | 1220 | # CONFIG_DEBUG_STACK_USAGE is not set |
1219 | # CONFIG_RUNTIME_DEBUG is not set | 1221 | # CONFIG_RUNTIME_DEBUG is not set |
1220 | 1222 | ||
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig index ff0fc0bedb2..ab07ec08c6f 100644 --- a/arch/mips/configs/pnx8550-stb810_defconfig +++ b/arch/mips/configs/pnx8550-stb810_defconfig | |||
@@ -1204,7 +1204,9 @@ CONFIG_DEBUG_SLAB=y | |||
1204 | CONFIG_FORCED_INLINING=y | 1204 | CONFIG_FORCED_INLINING=y |
1205 | # CONFIG_RCU_TORTURE_TEST is not set | 1205 | # CONFIG_RCU_TORTURE_TEST is not set |
1206 | CONFIG_CROSSCOMPILE=y | 1206 | CONFIG_CROSSCOMPILE=y |
1207 | CONFIG_CMDLINE_BOOL=y | ||
1207 | CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp" | 1208 | CONFIG_CMDLINE="console=ttyS1,38400n8 root=/dev/nfs ip=bootp" |
1209 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1208 | # CONFIG_DEBUG_STACK_USAGE is not set | 1210 | # CONFIG_DEBUG_STACK_USAGE is not set |
1209 | # CONFIG_RUNTIME_DEBUG is not set | 1211 | # CONFIG_RUNTIME_DEBUG is not set |
1210 | 1212 | ||
diff --git a/arch/mips/configs/powertv_defconfig b/arch/mips/configs/powertv_defconfig index 86c8007c174..7291633d81c 100644 --- a/arch/mips/configs/powertv_defconfig +++ b/arch/mips/configs/powertv_defconfig | |||
@@ -1418,7 +1418,9 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
1418 | CONFIG_HAVE_ARCH_KGDB=y | 1418 | CONFIG_HAVE_ARCH_KGDB=y |
1419 | # CONFIG_KGDB is not set | 1419 | # CONFIG_KGDB is not set |
1420 | # CONFIG_KMEMCHECK is not set | 1420 | # CONFIG_KMEMCHECK is not set |
1421 | CONFIG_CMDLINE_BOOL=y | ||
1421 | CONFIG_CMDLINE="rw dhash_entries=1024 ihash_entries=1024 ip=10.0.1.3:10.0.1.1:10.0.1.1:255.255.255.0:zeus:eth0: root=/dev/nfs nfsroot=/nfsroot/cramfs,wsize=512,rsize=512,tcp nokgdb console=ttyUSB0,115200 memsize=252M" | 1422 | CONFIG_CMDLINE="rw dhash_entries=1024 ihash_entries=1024 ip=10.0.1.3:10.0.1.1:10.0.1.1:255.255.255.0:zeus:eth0: root=/dev/nfs nfsroot=/nfsroot/cramfs,wsize=512,rsize=512,tcp nokgdb console=ttyUSB0,115200 memsize=252M" |
1423 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1422 | # CONFIG_DEBUG_STACK_USAGE is not set | 1424 | # CONFIG_DEBUG_STACK_USAGE is not set |
1423 | # CONFIG_RUNTIME_DEBUG is not set | 1425 | # CONFIG_RUNTIME_DEBUG is not set |
1424 | 1426 | ||
diff --git a/arch/mips/configs/rb532_defconfig b/arch/mips/configs/rb532_defconfig index a9408dbe0d2..57a50483abd 100644 --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig | |||
@@ -1203,7 +1203,7 @@ CONFIG_FRAME_WARN=1024 | |||
1203 | # CONFIG_HEADERS_CHECK is not set | 1203 | # CONFIG_HEADERS_CHECK is not set |
1204 | # CONFIG_DEBUG_KERNEL is not set | 1204 | # CONFIG_DEBUG_KERNEL is not set |
1205 | # CONFIG_SAMPLES is not set | 1205 | # CONFIG_SAMPLES is not set |
1206 | CONFIG_CMDLINE="" | 1206 | # CONFIG_CMDLINE_BOOL is not set |
1207 | 1207 | ||
1208 | # | 1208 | # |
1209 | # Security options | 1209 | # Security options |
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig index 1c9a5428aea..21c2022d46e 100644 --- a/arch/mips/configs/rbtx49xx_defconfig +++ b/arch/mips/configs/rbtx49xx_defconfig | |||
@@ -1061,7 +1061,7 @@ CONFIG_TRACING_SUPPORT=y | |||
1061 | # CONFIG_DYNAMIC_DEBUG is not set | 1061 | # CONFIG_DYNAMIC_DEBUG is not set |
1062 | # CONFIG_SAMPLES is not set | 1062 | # CONFIG_SAMPLES is not set |
1063 | CONFIG_HAVE_ARCH_KGDB=y | 1063 | CONFIG_HAVE_ARCH_KGDB=y |
1064 | CONFIG_CMDLINE="" | 1064 | # CONFIG_CMDLINE_BOOL is not set |
1065 | 1065 | ||
1066 | # | 1066 | # |
1067 | # Security options | 1067 | # Security options |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 5873fc50005..79036289003 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -1693,7 +1693,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1693 | # CONFIG_DEBUG_KERNEL is not set | 1693 | # CONFIG_DEBUG_KERNEL is not set |
1694 | CONFIG_LOG_BUF_SHIFT=14 | 1694 | CONFIG_LOG_BUF_SHIFT=14 |
1695 | CONFIG_CROSSCOMPILE=y | 1695 | CONFIG_CROSSCOMPILE=y |
1696 | CONFIG_CMDLINE="" | 1696 | # CONFIG_CMDLINE_BOOL is not set |
1697 | 1697 | ||
1698 | # | 1698 | # |
1699 | # Security options | 1699 | # Security options |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 5244716b67f..7f07bf02b83 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -960,7 +960,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
960 | # CONFIG_HEADERS_CHECK is not set | 960 | # CONFIG_HEADERS_CHECK is not set |
961 | # CONFIG_DEBUG_KERNEL is not set | 961 | # CONFIG_DEBUG_KERNEL is not set |
962 | # CONFIG_SAMPLES is not set | 962 | # CONFIG_SAMPLES is not set |
963 | CONFIG_CMDLINE="" | 963 | # CONFIG_CMDLINE_BOOL is not set |
964 | # CONFIG_SB1XXX_CORELIS is not set | 964 | # CONFIG_SB1XXX_CORELIS is not set |
965 | 965 | ||
966 | # | 966 | # |
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index 937b47cbb4a..c54d1128f9a 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig | |||
@@ -891,7 +891,9 @@ CONFIG_FRAME_WARN=1024 | |||
891 | # CONFIG_HEADERS_CHECK is not set | 891 | # CONFIG_HEADERS_CHECK is not set |
892 | # CONFIG_DEBUG_KERNEL is not set | 892 | # CONFIG_DEBUG_KERNEL is not set |
893 | # CONFIG_SAMPLES is not set | 893 | # CONFIG_SAMPLES is not set |
894 | CONFIG_CMDLINE_BOOL=y | ||
894 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 895 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
896 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
895 | 897 | ||
896 | # | 898 | # |
897 | # Security options | 899 | # Security options |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index da735840490..e7c5cd32a2b 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
@@ -894,7 +894,9 @@ CONFIG_FRAME_WARN=1024 | |||
894 | # CONFIG_HEADERS_CHECK is not set | 894 | # CONFIG_HEADERS_CHECK is not set |
895 | # CONFIG_DEBUG_KERNEL is not set | 895 | # CONFIG_DEBUG_KERNEL is not set |
896 | # CONFIG_SAMPLES is not set | 896 | # CONFIG_SAMPLES is not set |
897 | CONFIG_CMDLINE_BOOL=y | ||
897 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" | 898 | CONFIG_CMDLINE="cca=3 mem=32M console=ttyVR0,115200" |
899 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
898 | 900 | ||
899 | # | 901 | # |
900 | # Security options | 902 | # Security options |
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 99a0d21b8b2..b50032ba4d0 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
@@ -1076,7 +1076,9 @@ CONFIG_FRAME_WARN=1024 | |||
1076 | # CONFIG_HEADERS_CHECK is not set | 1076 | # CONFIG_HEADERS_CHECK is not set |
1077 | # CONFIG_DEBUG_KERNEL is not set | 1077 | # CONFIG_DEBUG_KERNEL is not set |
1078 | # CONFIG_SAMPLES is not set | 1078 | # CONFIG_SAMPLES is not set |
1079 | CONFIG_CMDLINE_BOOL=y | ||
1079 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1080 | CONFIG_CMDLINE="cca=3 mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
1081 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
1080 | 1082 | ||
1081 | # | 1083 | # |
1082 | # Security options | 1084 | # Security options |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index d3646ea51c2..c02ba08b69a 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
@@ -754,7 +754,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
754 | # CONFIG_HEADERS_CHECK is not set | 754 | # CONFIG_HEADERS_CHECK is not set |
755 | # CONFIG_DEBUG_KERNEL is not set | 755 | # CONFIG_DEBUG_KERNEL is not set |
756 | CONFIG_CROSSCOMPILE=y | 756 | CONFIG_CROSSCOMPILE=y |
757 | CONFIG_CMDLINE_BOOL=y | ||
757 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" | 758 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" |
759 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
758 | 760 | ||
759 | # | 761 | # |
760 | # Security options | 762 | # Security options |
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig index c137831cc6a..a35bc41389e 100644 --- a/arch/mips/configs/wrppmc_defconfig +++ b/arch/mips/configs/wrppmc_defconfig | |||
@@ -886,7 +886,9 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
886 | # CONFIG_DEBUG_KERNEL is not set | 886 | # CONFIG_DEBUG_KERNEL is not set |
887 | CONFIG_LOG_BUF_SHIFT=14 | 887 | CONFIG_LOG_BUF_SHIFT=14 |
888 | CONFIG_CROSSCOMPILE=y | 888 | CONFIG_CROSSCOMPILE=y |
889 | CONFIG_CMDLINE_BOOL=y | ||
889 | CONFIG_CMDLINE="console=ttyS0,115200n8" | 890 | CONFIG_CMDLINE="console=ttyS0,115200n8" |
891 | # CONFIG_CMDLINE_OVERRIDE is not set | ||
890 | 892 | ||
891 | # | 893 | # |
892 | # Security options | 894 | # Security options |
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index 4a04f0c1fa8..e3d68d651e7 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
@@ -823,7 +823,7 @@ CONFIG_DEBUG_MUTEXES=y | |||
823 | CONFIG_FORCED_INLINING=y | 823 | CONFIG_FORCED_INLINING=y |
824 | # CONFIG_RCU_TORTURE_TEST is not set | 824 | # CONFIG_RCU_TORTURE_TEST is not set |
825 | CONFIG_CROSSCOMPILE=y | 825 | CONFIG_CROSSCOMPILE=y |
826 | CONFIG_CMDLINE="" | 826 | # CONFIG_CMDLINE_BOOL is not set |
827 | # CONFIG_DEBUG_STACK_USAGE is not set | 827 | # CONFIG_DEBUG_STACK_USAGE is not set |
828 | # CONFIG_RUNTIME_DEBUG is not set | 828 | # CONFIG_RUNTIME_DEBUG is not set |
829 | 829 | ||
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index bd55f71055b..f9513f9e61d 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -58,8 +58,12 @@ EXPORT_SYMBOL(mips_machtype); | |||
58 | 58 | ||
59 | struct boot_mem_map boot_mem_map; | 59 | struct boot_mem_map boot_mem_map; |
60 | 60 | ||
61 | static char command_line[COMMAND_LINE_SIZE]; | 61 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
62 | char arcs_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; | 62 | char __initdata arcs_cmdline[COMMAND_LINE_SIZE]; |
63 | |||
64 | #ifdef CONFIG_CMDLINE_BOOL | ||
65 | static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; | ||
66 | #endif | ||
63 | 67 | ||
64 | /* | 68 | /* |
65 | * mips_io_port_base is the begin of the address space to which x86 style | 69 | * mips_io_port_base is the begin of the address space to which x86 style |
@@ -458,8 +462,20 @@ static void __init arch_mem_init(char **cmdline_p) | |||
458 | pr_info("Determined physical RAM map:\n"); | 462 | pr_info("Determined physical RAM map:\n"); |
459 | print_memory_map(); | 463 | print_memory_map(); |
460 | 464 | ||
461 | strlcpy(command_line, arcs_cmdline, sizeof(command_line)); | 465 | #ifdef CONFIG_CMDLINE_BOOL |
462 | strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); | 466 | #ifdef CONFIG_CMDLINE_OVERRIDE |
467 | strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); | ||
468 | #else | ||
469 | if (builtin_cmdline[0]) { | ||
470 | strlcat(arcs_cmdline, " ", COMMAND_LINE_SIZE); | ||
471 | strlcat(arcs_cmdline, builtin_cmdline, COMMAND_LINE_SIZE); | ||
472 | } | ||
473 | strlcpy(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); | ||
474 | #endif | ||
475 | #else | ||
476 | strlcpy(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); | ||
477 | #endif | ||
478 | strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); | ||
463 | 479 | ||
464 | *cmdline_p = command_line; | 480 | *cmdline_p = command_line; |
465 | 481 | ||