From 13da58d7136d3b74da87e666306c45cb63813805 Mon Sep 17 00:00:00 2001 From: Stephen Neuendorffer Date: Thu, 18 Nov 2010 15:54:56 -0800 Subject: [PATCH] --- yaml --- r: 227715 b: refs/heads/master c: e6ce1324e4f08b0d984340201a125806dae0e9a6 h: refs/heads/master i: 227713: 7306191f4df61cd3a945e04bc3adcb59123bcc76 227711: 589d8b2048037c880d17437651336d1e0b7178b3 v: v3 --- [refs] | 2 +- trunk/arch/microblaze/Kconfig | 2 +- trunk/arch/mips/Kconfig | 2 +- trunk/arch/powerpc/Kconfig | 2 +- trunk/drivers/of/Kconfig | 4 ++++ trunk/drivers/of/fdt.c | 4 ++++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cc022b4f943b..5c44f7bdd5d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55271024a735d0c3234e6ca7e0914b05aab7fbac +refs/heads/master: e6ce1324e4f08b0d984340201a125806dae0e9a6 diff --git a/trunk/arch/microblaze/Kconfig b/trunk/arch/microblaze/Kconfig index 387d5ffdfd3a..5f5018a71a3d 100644 --- a/trunk/arch/microblaze/Kconfig +++ b/trunk/arch/microblaze/Kconfig @@ -14,7 +14,7 @@ config MICROBLAZE select HAVE_DMA_API_DEBUG select TRACING_SUPPORT select OF - select OF_FLATTREE + select OF_EARLY_FLATTREE config SWAP def_bool n diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 0a9b5b8b2a19..f489ec30e071 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -2218,7 +2218,7 @@ config SECCOMP config USE_OF bool "Flattened Device Tree support" select OF - select OF_FLATTREE + select OF_EARLY_FLATTREE help Include support for flattened device tree machine descriptions. diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index e625e9e034ae..48fb4790bfec 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -116,7 +116,7 @@ config PPC bool default y select OF - select OF_FLATTREE + select OF_EARLY_FLATTREE select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER diff --git a/trunk/drivers/of/Kconfig b/trunk/drivers/of/Kconfig index e4b93a0a15d2..3c6e100a3ad0 100644 --- a/trunk/drivers/of/Kconfig +++ b/trunk/drivers/of/Kconfig @@ -19,6 +19,10 @@ config OF_FLATTREE bool select DTC +config OF_EARLY_FLATTREE + bool + select OF_FLATTREE + config OF_PROMTREE bool diff --git a/trunk/drivers/of/fdt.c b/trunk/drivers/of/fdt.c index c1360e02f921..2ebacf14e7de 100644 --- a/trunk/drivers/of/fdt.c +++ b/trunk/drivers/of/fdt.c @@ -27,6 +27,8 @@ int __initdata dt_root_size_cells; struct boot_param_header *initial_boot_params; +#ifdef CONFIG_OF_EARLY_FLATTREE + char *find_flat_dt_string(u32 offset) { return ((char *)initial_boot_params) + @@ -604,3 +606,5 @@ void __init unflatten_device_tree(void) pr_debug(" <- unflatten_device_tree()\n"); } + +#endif /* CONFIG_OF_EARLY_FLATTREE */