|
@@ -37,6 +37,8 @@
|
|
|
#endif
|
|
|
#if defined(CONFIG_OF_FLAT_TREE)
|
|
|
#include <ft_build.h>
|
|
|
+#elif defined(CONFIG_OF_LIBFDT)
|
|
|
+#include <libfdt.h>
|
|
|
#endif
|
|
|
|
|
|
int fixed_sdram(void);
|
|
@@ -234,22 +236,22 @@ void sdram_init(void)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
|
|
|
-void
|
|
|
-ft_board_setup(void *blob, bd_t *bd)
|
|
|
+#if defined(CONFIG_OF_BOARD_SETUP)
|
|
|
+void ft_board_setup(void *blob, bd_t *bd)
|
|
|
{
|
|
|
+#if defined(CONFIG_OF_FLAT_TREE)
|
|
|
u32 *p;
|
|
|
int len;
|
|
|
|
|
|
-#ifdef CONFIG_PCI
|
|
|
- ft_pci_setup(blob, bd);
|
|
|
-#endif
|
|
|
- ft_cpu_setup(blob, bd);
|
|
|
-
|
|
|
p = ft_get_prop(blob, "/memory/reg", &len);
|
|
|
if (p != NULL) {
|
|
|
*p++ = cpu_to_be32(bd->bi_memstart);
|
|
|
*p = cpu_to_be32(bd->bi_memsize);
|
|
|
}
|
|
|
+#endif
|
|
|
+ ft_cpu_setup(blob, bd);
|
|
|
+#ifdef CONFIG_PCI
|
|
|
+ ft_pci_setup(blob, bd);
|
|
|
+#endif
|
|
|
}
|
|
|
#endif
|