From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Kerr Subject: [PATCH 10/11] arm-dt: parse initrd from device tree Date: Tue, 22 Dec 2009 18:54:56 +0800 Message-ID: <1261479296.248651.573624023295.10.gpush@pororo> References: <1261479296.245235.191110925832.0.gpush@pororo> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1261479296.245235.191110925832.0.gpush@pororo> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org List-Id: devicetree@vger.kernel.org Move early_init_dt_setup_initrd_arch to arch/arm/mm/init.c, and populate it to set the properties of the parsed initrd area. Signed-off-by: Jeremy Kerr --- arch/arm/kernel/devtree.c | 3 --- arch/arm/mm/init.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 2ff4bd0..9fd1f24 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -23,9 +23,6 @@ struct device_node *of_chosen; void __init early_init_dt_scan_chosen_arch(unsigned long node) { } -void __init early_init_dt_setup_initrd_arch(unsigned long start, - unsigned long end) { } - void __init early_init_devtree_arch(void) { } int __init early_init_dt_scan_memory_arch(unsigned long node, diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 4d3c90f..77f09d6 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -18,6 +18,11 @@ #include #include +#ifdef CONFIG_ARM_DEVTREEE +#include +#include +#endif /* CONFIG_ARM_DEVTREEE */ + #include #include #include @@ -68,6 +73,16 @@ static int __init parse_tag_initrd2(const struct tag *tag) __tagtable(ATAG_INITRD2, parse_tag_initrd2); +#if defined(CONFIG_BLK_DEV_INITRD) && defined(CONFIG_ARM_DEVTREE) +void __init early_init_dt_setup_initrd_arch(unsigned long start, + unsigned long end) +{ + phys_initrd_start = start; + phys_initrd_size = end - start; +} +#endif /* CONFIG_BLK_DEV_INITRD && CONFIG_ARM_DEVTREE */ + + /* * This keeps memory configuration data used by a couple memory * initialization functions, as well as show_mem() for the skipping