diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:34:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-24 20:34:29 +0200 |
| commit | 07c9cd81170335307a3090add3cd37147d29482e (patch) | |
| tree | e5e98dc33dc17399ad16d85d6df1c36d44e22889 /board/freescale/mpc8536ds/mpc8536ds.c | |
| parent | 8024ac7a61f235b5444eac1ce0271d86e05d04de (diff) | |
| parent | 96623171423a94092cde80642328fda58a92c894 (diff) | |
| download | u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.zip u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.tar.gz u-boot-imx-07c9cd81170335307a3090add3cd37147d29482e.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/freescale/mpc8536ds/mpc8536ds.c')
| -rw-r--r-- | board/freescale/mpc8536ds/mpc8536ds.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index 50ca3ca..c8e0856 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -396,26 +396,8 @@ void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); -#ifdef CONFIG_PCI1 - ft_fsl_pci_setup(blob, "pci0", &pci1_hose); -#else - ft_fsl_pci_setup(blob, "pci0", NULL); -#endif -#ifdef CONFIG_PCIE2 - ft_fsl_pci_setup(blob, "pci1", &pcie2_hose); -#else - ft_fsl_pci_setup(blob, "pci1", NULL); -#endif -#ifdef CONFIG_PCIE2 - ft_fsl_pci_setup(blob, "pci2", &pcie1_hose); -#else - ft_fsl_pci_setup(blob, "pci2", NULL); -#endif -#ifdef CONFIG_PCIE1 - ft_fsl_pci_setup(blob, "pci3", &pcie3_hose); -#else - ft_fsl_pci_setup(blob, "pci3", NULL); -#endif + FT_FSL_PCI_SETUP; + #ifdef CONFIG_FSL_SGMII_RISER fsl_sgmii_riser_fdt_fixup(blob); #endif |