---

yaml --- r: 227715 b: refs/heads/master c: e6ce132 h: refs/heads/master i: 227713: 7306191 227711: 589d8b2 v: v3
git-mirror · Dec 29, 2010 · 13da58d · 13da58d
1 parent eea862a
commit 13da58d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 */