diff options
| -rw-r--r-- | board/freescale/mpc8313erdb/mpc8313erdb.c | 14 | ||||
| -rw-r--r-- | board/freescale/mpc8323erdb/mpc8323erdb.c | 10 | ||||
| -rw-r--r-- | board/freescale/mpc832xemds/mpc832xemds.c | 14 | ||||
| -rw-r--r-- | board/freescale/mpc832xemds/pci.c | 3 | ||||
| -rw-r--r-- | board/freescale/mpc8349emds/mpc8349emds.c | 14 | ||||
| -rw-r--r-- | board/freescale/mpc8349itx/mpc8349itx.c | 14 | ||||
| -rw-r--r-- | board/freescale/mpc8360emds/mpc8360emds.c | 13 | ||||
| -rw-r--r-- | board/freescale/mpc837xemds/mpc837xemds.c | 14 | ||||
| -rw-r--r-- | board/sbc8349/sbc8349.c | 14 | 
9 files changed, 7 insertions, 103 deletions
| diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index 861c143df..42019fb80 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -23,9 +23,7 @@   */  #include <common.h> -#if defined(CONFIG_OF_FLAT_TREE) -#include <ft_build.h> -#elif defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT)  #include <libfdt.h>  #endif  #include <pci.h> @@ -103,16 +101,6 @@ void pci_init_board(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/mpc8323erdb/mpc8323erdb.c b/board/freescale/mpc8323erdb/mpc8323erdb.c index e73861300..2fc4fd6cb 100644 --- a/board/freescale/mpc8323erdb/mpc8323erdb.c +++ b/board/freescale/mpc8323erdb/mpc8323erdb.c @@ -184,16 +184,6 @@ void pci_init_board(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/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c index 6ba25d464..6adf7e7b7 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 d50b78aa8..21641d439 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); diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c index 39c091627..3d72eb7d8 100644 --- a/board/freescale/mpc8349emds/mpc8349emds.c +++ b/board/freescale/mpc8349emds/mpc8349emds.c @@ -32,9 +32,7 @@  #if defined(CONFIG_SPD_EEPROM)  #include <spd_sdram.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 @@ -256,16 +254,6 @@ void sdram_init(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/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); diff --git a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c index a899800a8..2fcef8b4d 100644 --- a/board/freescale/mpc8360emds/mpc8360emds.c +++ b/board/freescale/mpc8360emds/mpc8360emds.c @@ -25,9 +25,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) @@ -304,16 +302,7 @@ void sdram_init(void)  void ft_board_setup(void *blob, bd_t *bd)  {  	const immap_t *immr = (immap_t *)CFG_IMMR; -#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/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 0e4ec0213..6925d23b3 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -16,9 +16,7 @@  #if defined(CONFIG_SPD_EEPROM)  #include <spd_sdram.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) @@ -126,16 +124,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/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c index 097ab8043..5446c205e 100644 --- a/board/sbc8349/sbc8349.c +++ b/board/sbc8349/sbc8349.c @@ -35,9 +35,7 @@  #if defined(CONFIG_SPD_EEPROM)  #include <spd_sdram.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 @@ -239,16 +237,6 @@ void sdram_init(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); |