c6x: use common built-in dtb support

[muen/linux.git] / arch / c6x / kernel / setup.c

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index 786e36e2f61de91c8f446cc941cff895cdb91578..509c5f0864964f35b7614d1682b236e81fdcfa74 100644 (file)
--- 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)
 notrace void __init machine_init(unsigned long dt_ptr)
 {
        void *dtb = __va(dt_ptr);
 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);
 
        /* interrupts must be masked */
        set_creg(IER, 2);


@@ -363,7 +363,7 @@ void __init setup_arch(char **cmdline_p)
                                         memory_end >> PAGE_SHIFT);
        memblock_reserve(memory_start, bootmap_size);
 
                                         memory_end >> PAGE_SHIFT);
        memblock_reserve(memory_start, bootmap_size);
 

-       unflatten_device_tree();
+       unflatten_and_copy_device_tree();

 
        c6x_cache_init();
 
 
        c6x_cache_init();