diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2007-08-15 22:30:33 -0500 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2007-08-15 22:36:33 -0500 |
commit | 3fde9e8b22cfbd7af489214758f9839a206576cb (patch) | |
tree | 644df1662083d42bb2ffe3db45b1e541ff143794 /board/mpc8313erdb | |
parent | 6a16e0dfcc4119b46adb1dce2d6c8fb3c5d108e1 (diff) | |
download | u-boot-imx-3fde9e8b22cfbd7af489214758f9839a206576cb.zip u-boot-imx-3fde9e8b22cfbd7af489214758f9839a206576cb.tar.gz u-boot-imx-3fde9e8b22cfbd7af489214758f9839a206576cb.tar.bz2 |
mpc83xx: migrate remaining freescale boards to libfdt
this adds libfdt support code for the freescale
mpc8313erdb, mpc832xemds, mpc8349emds, mpc8349itx,
and gp boards.
Boards remain compatible with OF_FLAT_TREE.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/mpc8313erdb')
-rw-r--r-- | board/mpc8313erdb/mpc8313erdb.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/board/mpc8313erdb/mpc8313erdb.c b/board/mpc8313erdb/mpc8313erdb.c index 999fe9e..861c143 100644 --- a/board/mpc8313erdb/mpc8313erdb.c +++ b/board/mpc8313erdb/mpc8313erdb.c @@ -23,7 +23,11 @@ */ #include <common.h> +#if defined(CONFIG_OF_FLAT_TREE) #include <ft_build.h> +#elif defined(CONFIG_OF_LIBFDT) +#include <libfdt.h> +#endif #include <pci.h> #include <mpc83xx.h> @@ -96,21 +100,22 @@ void pci_init_board(void) mpc83xx_pci_init(1, reg, warmboot); } -#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) +#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) { + 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 |