diff options
| author | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-10-04 14:16:15 -0500 |
| commit | 4355151de47c2b4bc72c026ee743bd9ed7f71ba3 (patch) | |
| tree | 159451d359e3154734e1fb3205556f1c421f878e /arch/c6x/kernel | |
| parent | 5d5a0ab1a7918fce5ca5c0fb1871a3e2000f85de (diff) | |
| parent | 92f687f40ee511e0ea6046bf63ceb48ff3ad1494 (diff) | |
Merge branch 'all-dtbs' into dt/next
Diffstat (limited to 'arch/c6x/kernel')
| -rw-r--r-- | arch/c6x/kernel/setup.c | 4 | ||||
| -rw-r--r-- | arch/c6x/kernel/vmlinux.lds.S | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c index 2e97455ca0b7..05d96a9541b5 100644 --- a/arch/c6x/kernel/setup.c +++ b/arch/c6x/kernel/setup.c @@ -265,7 +265,7 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size) notrace void __init machine_init(unsigned long dt_ptr) { void *dtb = __va(dt_ptr); - void *fdt = _fdt_start; + void *fdt = __dtb_start; /* interrupts must be masked */ set_creg(IER, 2); @@ -358,7 +358,7 @@ void __init setup_arch(char **cmdline_p) memory_end >> PAGE_SHIFT); memblock_reserve(memory_start, bootmap_size); - unflatten_device_tree(); + unflatten_and_copy_device_tree(); c6x_cache_init(); diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S index 1fba5b421eee..584bab2bace6 100644 --- a/arch/c6x/kernel/vmlinux.lds.S +++ b/arch/c6x/kernel/vmlinux.lds.S @@ -90,16 +90,6 @@ SECTIONS *(.switch) } - . = ALIGN (8) ; - __fdt_blob : AT(ADDR(__fdt_blob) - LOAD_OFFSET) - { - _fdt_start = . ; /* place for fdt blob */ - *(__fdt_blob) ; /* Any link-placed DTB */ - BYTE(0); /* section always has contents */ - . = _fdt_start + 0x4000; /* Pad up to 16kbyte */ - _fdt_end = . ; - } - _etext = .; /* |