]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
sbc8349: migrate board to libfdt
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 20 Dec 2007 17:58:16 +0000 (12:58 -0500)
committerKim Phillips <kim.phillips@freescale.com>
Tue, 8 Jan 2008 15:55:41 +0000 (09:55 -0600)
This adds libfdt support code for the Wind River sbc8349 board.

Parallel of commit 3fde9e8b22cfbd7af489214758f9839a206576cb for
the other Freescale 83xx boards.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
board/sbc8349/sbc8349.c

index da3771467fb49e4ae84a3acbf50dd0acf3385bcc..097ab8043b566d63cd3292c2e7f815c3212b7851 100644 (file)
@@ -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