diff options
| author | Guo Ren <ren_guo@c-sky.com> | 2019-04-12 14:08:34 +0300 |
|---|---|---|
| committer | Guo Ren <ren_guo@c-sky.com> | 2019-04-22 08:44:57 +0300 |
| commit | 205353fa06cc5dbfe1949de013ba905bb151c702 (patch) | |
| tree | a51d0bfb604e0794aa6a1665794e5fa98e3bdd1d /arch/csky/kernel/setup.c | |
| parent | b4bf274198bd415e66af0b54a2e181c59fd43ba4 (diff) | |
| download | linux-205353fa06cc5dbfe1949de013ba905bb151c702.tar.xz | |
csky: Support vmlinux bootup with MMU off
Modify SETUP_MMU macro to fit on both MMU-on or MMU-off enviornment
and vmlinux could bootup from MMU off enviornment for some cases.
Unify the style of _start and _start_smp_secondary in head.S to make
head.S looks more concise and easy to understand.
Signed-off-by: Guo Ren <ren_guo@c-sky.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/csky/kernel/setup.c')
| -rw-r--r-- | arch/csky/kernel/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index c377194e4b8f..36fc04b9417d 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -145,7 +145,8 @@ void __init setup_arch(char **cmdline_p) unsigned long phys_offset; EXPORT_SYMBOL(phys_offset); -asmlinkage __visible void __init csky_start(unsigned int unused, void *param) +asmlinkage __visible void __init csky_start(unsigned int unused, + void *dtb_start) { /* Clean up bss section */ memset(__bss_start, 0, __bss_stop - __bss_start); @@ -155,10 +156,10 @@ asmlinkage __visible void __init csky_start(unsigned int unused, void *param) pre_trap_init(); pre_mmu_init(); - if (param == NULL) + if (dtb_start == NULL) early_init_dt_scan(__dtb_start); else - early_init_dt_scan(param); + early_init_dt_scan(dtb_start); start_kernel(); |