diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2017-03-13 10:34:36 -0700 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2017-03-13 13:47:20 -0700 |
| commit | fbe22d280014e783fe2454db2a0ba44fc4f68a5a (patch) | |
| tree | 6210fb99a4704fd52fd3af840fa8e1f7c48a167b /arch/xtensa/kernel | |
| parent | e8cd8da934f29a0aca2c4bd96310a0b6ba6e31a7 (diff) | |
| download | linux-stable-fbe22d280014e783fe2454db2a0ba44fc4f68a5a.tar.gz linux-stable-fbe22d280014e783fe2454db2a0ba44fc4f68a5a.tar.bz2 linux-stable-fbe22d280014e783fe2454db2a0ba44fc4f68a5a.zip | |
xtensa: ISS: update kernel command line in platform_setup
Move platform_setup call higher in initialization sequence so that it
could change kernel command line.
Check command line passed to simulator in ISS platform_stup and update
kernel command line if there's anything.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 8fd4be610607..48ffc58ca38a 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -317,8 +317,9 @@ static inline int mem_reserve(unsigned long start, unsigned long end) void __init setup_arch(char **cmdline_p) { - strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; + platform_setup(cmdline_p); + strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE); /* Reserve some memory regions */ @@ -379,8 +380,6 @@ void __init setup_arch(char **cmdline_p) unflatten_and_copy_device_tree(); - platform_setup(cmdline_p); - #ifdef CONFIG_SMP smp_init_cpus(); #endif |