lkml.org 
[lkml]   [2013]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/9] c6x: Remove duplicate DT selection logic
    Date
    early_init_dt_scan() now takes care of falling back to the built-in DTB.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Mark Salter <msalter@redhat.com>
    Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
    Cc: linux-c6x-dev@linux-c6x.org
    ---
    arch/c6x/kernel/setup.c | 10 +---------
    1 file changed, 1 insertion(+), 9 deletions(-)

    diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
    index 414353027ba9..ad7c5d73bb3c 100644
    --- a/arch/c6x/kernel/setup.c
    +++ b/arch/c6x/kernel/setup.c
    @@ -266,7 +266,6 @@ int __init c6x_add_memory(phys_addr_t start, unsigned long size)
    notrace void __init machine_init(unsigned long dt_ptr)
    {
    struct boot_param_header *dtb = __va(dt_ptr);
    - struct boot_param_header *fdt = &__dtb_start;

    /* interrupts must be masked */
    set_creg(IER, 2);
    @@ -279,15 +278,8 @@ notrace void __init machine_init(unsigned long dt_ptr)

    lockdep_init();

    - /*
    - * dtb is passed in from bootloader.
    - * fdt is linked in blob.
    - */
    - if (dtb && dtb != fdt)
    - fdt = dtb;
    -
    /* Do some early initialization based on the flat device tree */
    - early_init_dt_scan(fdt);
    + early_init_dt_scan(dtb);

    parse_early_param();
    }
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-11-19 13:21    [W:5.130 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site