aboutsummaryrefslogtreecommitdiffstats
path: root/arch/c6x/kernel/setup.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-08-01 17:00:12 -0400
committerRob Herring <robh@kernel.org>2018-10-02 10:22:49 -0400
commitbe7cd2df1d22d29e5f23ce8744fc465cc07cc2bc (patch)
treea4cd426bc23d72fab2a595f149dcbf353cd23b6a /arch/c6x/kernel/setup.c
parenta91c614510478598051e8c49adb9863ee47959ec (diff)
c6x: use common built-in dtb support
Using the common build support for built-in dtb files just requires adding a .dtb.o target to obj-y. The dtb now needs to be copied when unflattened because an init section is used now. Cc: Mark Salter <msalter@redhat.com> Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com> Cc: linux-c6x-dev@linux-c6x.org Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch/c6x/kernel/setup.c')
-rw-r--r--arch/c6x/kernel/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 786e36e2f61d..509c5f086496 100644
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -270,7 +270,7 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
270notrace void __init machine_init(unsigned long dt_ptr) 270notrace void __init machine_init(unsigned long dt_ptr)
271{ 271{
272 void *dtb = __va(dt_ptr); 272 void *dtb = __va(dt_ptr);
273 void *fdt = _fdt_start; 273 void *fdt = __dtb_start;
274 274
275 /* interrupts must be masked */ 275 /* interrupts must be masked */
276 set_creg(IER, 2); 276 set_creg(IER, 2);
@@ -363,7 +363,7 @@ void __init setup_arch(char **cmdline_p)
363 memory_end >> PAGE_SHIFT); 363 memory_end >> PAGE_SHIFT);
364 memblock_reserve(memory_start, bootmap_size); 364 memblock_reserve(memory_start, bootmap_size);
365 365
366 unflatten_device_tree(); 366 unflatten_and_copy_device_tree();
367 367
368 c6x_cache_init(); 368 c6x_cache_init();
369 369