diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-09 21:34:46 +0100 |
| commit | 3b93020d74630f0574cbd26d200a82c00dd11eaa (patch) | |
| tree | fdf53ce4da01d337ceb71cadf496a9fc8d2fb62c /board/freescale/mpc8349itx/mpc8349itx.c | |
| parent | c83d7ca4dadd44ae430235077f63b64a11f36f6e (diff) | |
| parent | 6007f3251c0967adc13f2ed8be1b924ddc30124d (diff) | |
| download | olio-uboot-2014.01-3b93020d74630f0574cbd26d200a82c00dd11eaa.tar.xz olio-uboot-2014.01-3b93020d74630f0574cbd26d200a82c00dd11eaa.zip | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'board/freescale/mpc8349itx/mpc8349itx.c')
| -rw-r--r-- | board/freescale/mpc8349itx/mpc8349itx.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c index c82f7847a..8c19ad6c9 100644 --- a/board/freescale/mpc8349itx/mpc8349itx.c +++ b/board/freescale/mpc8349itx/mpc8349itx.c @@ -37,9 +37,7 @@ #else #include <asm/mmu.h> #endif -#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -#elif defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) #include <libfdt.h> #endif @@ -389,16 +387,6 @@ int misc_init_r(void) #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; - - 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); |