diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-18 21:47:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-18 21:47:33 +0200 |
| commit | 1d55483cf7fb11e4902359bc04e39489e044e695 (patch) | |
| tree | 8f0eca05ff445dced74a824b94352169cc23a609 /board/freescale/mpc8323erdb/mpc8323erdb.c | |
| parent | 9edd580e91d7eb031298294063f5aa9fa7f0a330 (diff) | |
| parent | 4cc1cd5941827a04cf5c51a07fcc42e8945894aa (diff) | |
| download | u-boot-imx-1d55483cf7fb11e4902359bc04e39489e044e695.zip u-boot-imx-1d55483cf7fb11e4902359bc04e39489e044e695.tar.gz u-boot-imx-1d55483cf7fb11e4902359bc04e39489e044e695.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
Diffstat (limited to 'board/freescale/mpc8323erdb/mpc8323erdb.c')
| -rw-r--r-- | board/freescale/mpc8323erdb/mpc8323erdb.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/board/freescale/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index 1886f19..e738613 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -17,7 +17,6 @@ #include <miiphy.h> #include <command.h> #include <libfdt.h> -#include <libfdt_env.h> #if defined(CONFIG_PCI) #include <pci.h> #endif @@ -92,8 +91,6 @@ long int initdram(int board_type) msize = fixed_sdram(); - puts("\n DDR RAM: "); - /* return total bus SDRAM size(bytes) -- DDR */ return (msize * 1024 * 1024); } @@ -185,33 +182,21 @@ void pci_init_board(void) } #if defined(CONFIG_OF_BOARD_SETUP) - -/* - * Prototypes of functions that we use. - */ -void ft_cpu_setup(void *blob, bd_t *bd); - -#ifdef CONFIG_PCI -void ft_pci_setup(void *blob, bd_t *bd); -#endif - -void -ft_board_setup(void *blob, bd_t *bd) +void ft_board_setup(void *blob, bd_t *bd) { - int nodeoffset; - int tmp[2]; - - nodeoffset = fdt_find_node_by_path(blob, "/memory"); - if (nodeoffset >= 0) { - tmp[0] = cpu_to_be32(bd->bi_memstart); - tmp[1] = cpu_to_be32(bd->bi_memsize); - fdt_setprop(blob, nodeoffset, "reg", tmp, sizeof(tmp)); +#if defined(CONFIG_OF_FLAT_TREE) + u32 *p; + int len; + + 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 /* CONFIG_OF_BOARD_SETUP */ +#endif |