summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreentime Hu <greentime@andestech.com>2018-06-28 18:29:21 +0800
committerGreentime Hu <greentime@andestech.com>2018-07-03 11:12:06 +0800
commit6897e6ecb3167598cb45e1a1424dd4d5e3778837 (patch)
tree5a3941d87f779014275cced320aceee690695e55 /arch
parentf706abf188a82c9d961ed267a18ff5cb5e9aace9 (diff)
downloadlinux-stable-6897e6ecb3167598cb45e1a1424dd4d5e3778837.tar.gz
linux-stable-6897e6ecb3167598cb45e1a1424dd4d5e3778837.tar.bz2
linux-stable-6897e6ecb3167598cb45e1a1424dd4d5e3778837.zip
nds32: Fix the dts pointer is not passed correctly issue.
We found that the original implementation will only use the built-in dtb pointer instead of the pointer pass from bootloader. This bug is fixed by this patch. Signed-off-by: Greentime Hu <greentime@andestech.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/nds32/kernel/setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c
index 2f5b2ccebe47..63a1a5ef5219 100644
--- a/arch/nds32/kernel/setup.c
+++ b/arch/nds32/kernel/setup.c
@@ -278,7 +278,8 @@ static void __init setup_memory(void)
void __init setup_arch(char **cmdline_p)
{
- early_init_devtree( __dtb_start);
+ early_init_devtree(__atags_pointer ? \
+ phys_to_virt(__atags_pointer) : __dtb_start);
setup_cpuinfo();