From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshinori Sato Date: Wed, 29 Jun 2016 13:40:47 +0000 Subject: [PATCH v4 02/22] sh: More early unflatten device tree Message-Id: <1467207667-15768-3-git-send-email-ysato@users.sourceforge.jp> List-Id: References: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp> In-Reply-To: <1467207667-15768-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. Changes v4 none 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752968AbcF2OGq (ORCPT ); Wed, 29 Jun 2016 10:06:46 -0400 Received: from mail1.asahi-net.or.jp ([202.224.39.197]:60581 "EHLO mail1.asahi-net.or.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752191AbcF2NlO (ORCPT ); Wed, 29 Jun 2016 09:41:14 -0400 From: Yoshinori Sato To: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yoshinori Sato Subject: [PATCH v4 02/22] sh: More early unflatten device tree Date: Wed, 29 Jun 2016 22:40:47 +0900 Message-Id: <1467207667-15768-3-git-send-email-ysato@users.sourceforge.jp> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp> References: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org unflatten required MMU disabled. Changes v4 none 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