From 2408b3f20bcbdd9c6c397cd03ab0d71d54680a40 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Thu, 20 Dec 2007 12:58:16 -0500 Subject: [PATCH] sbc8349: migrate board to libfdt 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 --- board/sbc8349/sbc8349.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c index da3771467f..097ab8043b 100644 --- a/board/sbc8349/sbc8349.c +++ b/board/sbc8349/sbc8349.c @@ -37,6 +37,8 @@ #endif #if defined(CONFIG_OF_FLAT_TREE) #include +#elif defined(CONFIG_OF_LIBFDT) +#include #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 -- 2.39.5