diff options
| author | Michal Simek <monstr@monstr.eu> | 2009-05-21 08:20:30 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2009-05-21 16:39:05 +0200 |
| commit | 1dff89a9c7fab71b43ba79cc1aa6c6dbad582a35 (patch) | |
| tree | c994f51ff18146375fddac4afae233915b6c5ab3 /arch/microblaze/kernel/prom.c | |
| parent | microblaze: Guard __HAVE_ARCH macros with __KERNEL__ in string.h (diff) | |
| download | linux-1dff89a9c7fab71b43ba79cc1aa6c6dbad582a35.tar.xz linux-1dff89a9c7fab71b43ba79cc1aa6c6dbad582a35.zip | |
microblaze: Fix early cmdline for CMDLINE_FORCE
This patch fixed parsing early parameters because
current implementation does that early parse DTS
command line and then parse CMDLINE line which is compiled-in.
For case that DTS doesn't contain command line is
copied command line from kernel with is done in prom.c
that's why I can remove it from machine_early_init.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 34c48718061a..003d37360623 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -563,7 +563,9 @@ static int __init early_init_dt_scan_chosen(unsigned long node, strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE)); #ifdef CONFIG_CMDLINE +#ifndef CONFIG_CMDLINE_FORCE if (p == NULL || l == 0 || (l == 1 && (*p) == 0)) +#endif strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #endif /* CONFIG_CMDLINE */ |