lkml.org 
[lkml]   [2016]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 02/22] sh: More early unflatten device tree
    Date
    unflatten required MMU disabled.

    Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
    ---
    arch/sh/boards/of-generic.c | 6 ------
    arch/sh/kernel/setup.c | 7 +++++++
    2 files changed, 7 insertions(+), 6 deletions(-)

    diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c
    index 8dbf978..3db4294 100644
    --- a/arch/sh/boards/of-generic.c
    +++ b/arch/sh/boards/of-generic.c
    @@ -129,12 +129,6 @@ static void __init sh_of_setup(char **cmdline_p)
    {
    struct device_node *root;

    -#ifdef CONFIG_USE_BUILTIN_DTB
    - unflatten_and_copy_device_tree();
    -#else
    - unflatten_device_tree();
    -#endif
    -
    board_time_init = sh_of_time_init;

    sh_mv.mv_name = "Unknown SH model";
    diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
    index 5b9eb70..86f2792 100644
    --- a/arch/sh/kernel/setup.c
    +++ b/arch/sh/kernel/setup.c
    @@ -271,6 +271,13 @@ void __ref sh_fdt_init(phys_addr_t dt_phys)

    void __init setup_arch(char **cmdline_p)
    {
    +#ifdef CONFIG_OF
    +#ifdef CONFIG_USE_BUILTIN_DTB
    + unflatten_and_copy_device_tree();
    +#else
    + unflatten_device_tree();
    +#endif
    +#endif
    enable_mmu();

    ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-07-03 19:21    [W:4.122 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site