On Thu, 30 Aug 2007 12:20:14 -0600 Grant Likely grant.likely@secretlab.ca wrote:
From: Grant Likely grant.likely@secretlab.ca
Here is a patch which converts the icecube* and tqm5200 boards from using OF_FLAT_TREE to OF_LIBFDT. It also fixes the compile of cm5200.
It's been tested on the lite5200.
Still to be resolved: is there a better place to put the helper functions.
the way you've done them, they probably belong in libfdt space.
diff --git a/board/icecube/icecube.c b/board/icecube/icecube.c index c027f6f..6a2a77a 100644 --- a/board/icecube/icecube.c +++ b/board/icecube/icecube.c @@ -29,9 +29,11 @@ #include <pci.h> #include <asm/processor.h>
-#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -#endif +#ifdef CONFIG_OF_LIBFDT +#include <libfdt.h>
+#include <libfdt_env.h> +#include <fdt_support.h>
you really don't need (or want) the above two.
+#endif /* CONFIG_OF_LIBFDT */
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c index 51f4aeb..09f1709 100644 --- a/board/tqm5200/tqm5200.c +++ b/board/tqm5200/tqm5200.c @@ -32,9 +32,11 @@ #include <pci.h> #include <asm/processor.h>
-#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -#endif +#ifdef CONFIG_OF_LIBFDT +#include <libfdt.h> +#include <libfdt_env.h> +#include <fdt_support.h>
ditto.
+#endif /* CONFIG_OF_LIBFDT */
do the includes need such protection?
+void ft_cpu_setup(void *blob, bd_t *bd) +{
- char * cpu_path = "/cpus/" OF_CPU;
- char * eth_path = "/" OF_SOC "/ethernet@3000";
s/char * /char */
actually, we should get rid of OF_CPU, and OF_SOC altogether. fdt_find_node_by_type "cpu" and "soc" should be used instead. The cpu update code probably belongs in lib_ppc.
Kim