diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-12-20 15:57:28 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2008-01-08 09:56:42 -0600 |
| commit | b3458d2cd55d01732e30a76d898afd99e871cd67 (patch) | |
| tree | 0bade71ea74f792090737d2559f8644b578ac64a /board/freescale/mpc832xemds | |
| parent | 5b8bc606c61456566af6912f818a153b6b06f242 (diff) | |
| download | talos-obmc-uboot-b3458d2cd55d01732e30a76d898afd99e871cd67.tar.gz talos-obmc-uboot-b3458d2cd55d01732e30a76d898afd99e871cd67.zip | |
mpc83xx: remove FLAT_TREE code
need to rm it from pci code, too!
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'board/freescale/mpc832xemds')
| -rw-r--r-- | board/freescale/mpc832xemds/mpc832xemds.c | 14 | ||||
| -rw-r--r-- | board/freescale/mpc832xemds/pci.c | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/board/freescale/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c index 6ba25d4644..6adf7e7b74 100644 --- a/board/freescale/mpc832xemds/mpc832xemds.c +++ b/board/freescale/mpc832xemds/mpc832xemds.c @@ -27,9 +27,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 #if defined(CONFIG_PQ_MDS_PIB) @@ -169,16 +167,6 @@ int checkboard(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); diff --git a/board/freescale/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c index d50b78aa84..21641d4396 100644 --- a/board/freescale/mpc832xemds/pci.c +++ b/board/freescale/mpc832xemds/pci.c @@ -269,9 +269,6 @@ void ft_pci_setup(void *blob, bd_t *bd) int tmp[2]; const char *path; - if (pci_num_buses < 1) - return; - nodeoffset = fdt_path_offset(blob, "/aliases"); if (nodeoffset >= 0) { path = fdt_getprop(blob, nodeoffset, "pci0", NULL); |
