diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-03 17:52:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-05-03 17:52:20 +0200 |
| commit | 0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69 (patch) | |
| tree | f496e5137c76b74a06fc9002edd12d63bd575f7f /board/mpc8349emds/mpc8349emds.c | |
| parent | 610cf3676ee7376e0a55419626a30414a7b20db2 (diff) | |
| parent | 8fe9bf61efa6cab617dc99dfc5413e47f2ef969f (diff) | |
| download | u-boot-imx-0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69.zip u-boot-imx-0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69.tar.gz u-boot-imx-0cf7d8aa0b24577e50b4bf6ab5da87caa09cfd69.tar.bz2 | |
Merge with git://git.kernel.org/pub/scm/boot/u-boot/galak/u-boot.git#mpc8349emds
Diffstat (limited to 'board/mpc8349emds/mpc8349emds.c')
| -rw-r--r-- | board/mpc8349emds/mpc8349emds.c | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/board/mpc8349emds/mpc8349emds.c b/board/mpc8349emds/mpc8349emds.c index 7ece7db..b5ccb53 100644 --- a/board/mpc8349emds/mpc8349emds.c +++ b/board/mpc8349emds/mpc8349emds.c @@ -30,9 +30,6 @@ #include <spd.h> #include <miiphy.h> #include <command.h> -#if defined(CONFIG_PCI) -#include <pci.h> -#endif #if defined(CONFIG_SPD_EEPROM) #include <spd_sdram.h> #endif @@ -50,6 +47,11 @@ int board_early_init_f (void) /* Enable flash write */ bcsr[1] &= ~0x01; +#ifdef CFG_USE_MPC834XSYS_USB_PHY + /* Use USB PHY on SYS board */ + bcsr[5] |= 0x02; +#endif + return 0; } @@ -152,44 +154,6 @@ int checkboard (void) return 0; } -#if defined(CONFIG_PCI) -/* - * Initialize PCI Devices, report devices found - */ -#ifndef CONFIG_PCI_PNP -static struct pci_config_table pci_mpc8349emds_config_table[] = { - {PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID,PCI_ANY_ID, - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR, - PCI_ENET0_MEMADDR, - PCI_COMMON_MEMORY | PCI_COMMAND_MASTER - } }, - {} -} -#endif - -volatile static struct pci_controller hose[] = { - { -#ifndef CONFIG_PCI_PNP - config_table:pci_mpc8349emds_config_table, -#endif - }, - { -#ifndef CONFIG_PCI_PNP - config_table:pci_mpc8349emds_config_table, -#endif - } -}; -#endif /* CONFIG_PCI */ - -void pci_init_board(void) -{ -#ifdef CONFIG_PCI - extern void pci_mpc83xx_init(volatile struct pci_controller *hose); - - pci_mpc83xx_init(hose); -#endif /* CONFIG_PCI */ -} - /* * if MPC8349EMDS is soldered with SDRAM */ |