From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshinori Sato Date: Sun, 03 Jul 2016 16:46:22 +0000 Subject: [PATCH v5 02/22] sh: More early unflatten device tree Message-Id: <1467564402-2649-3-git-send-email-ysato@users.sourceforge.jp> List-Id: References: <1467564402-2649-1-git-send-email-ysato@users.sourceforge.jp> In-Reply-To: <1467564402-2649-1-git-send-email-ysato@users.sourceforge.jp> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yoshinori Sato unflatten required MMU disabled. Signed-off-by: Yoshinori Sato --- 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