diff options
| author | Becky Bruce <becky.bruce@freescale.com> | 2008-10-31 17:14:00 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-11-03 11:04:59 -0600 |
| commit | 98693b85d42ff438375dc6d6dcadc70eb7b050bb (patch) | |
| tree | 0fa0d95fadabb076697ddd38b2e9a73772ec4e69 | |
| parent | 3ec53148eb68ddfb0c3311fb4c06cd2bd0ef3eeb (diff) | |
| download | u-boot-imx-98693b85d42ff438375dc6d6dcadc70eb7b050bb.zip u-boot-imx-98693b85d42ff438375dc6d6dcadc70eb7b050bb.tar.gz u-boot-imx-98693b85d42ff438375dc6d6dcadc70eb7b050bb.tar.bz2 | |
mpc8641: Stop supporting non-PCI_PNP configs
We don't actually ever do this, remove the code so we
can stop maintaining it.
Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c | 22 | ||||
| -rw-r--r-- | include/configs/MPC8641HPCN.h | 6 |
2 files changed, 1 insertions, 27 deletions
diff --git a/board/freescale/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c index 0069b9c..a03ca74 100644 --- a/board/freescale/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -121,27 +121,7 @@ fixed_sdram(void) #if defined(CONFIG_PCI) -/* - * Initialize PCI Devices, report devices found. - */ - -#ifndef CONFIG_PCI_PNP -static struct pci_config_table pci_fsl86xxads_config_table[] = { - {PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_IDSEL_NUMBER, PCI_ANY_ID, - pci_cfgfunc_config_device, {PCI_ENET0_IOADDR, - PCI_ENET0_MEMADDR, - PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER}}, - {} -}; -#endif - - -static struct pci_controller pci1_hose = { -#ifndef CONFIG_PCI_PNP - config_table:pci_mpc86xxcts_config_table -#endif -}; +static struct pci_controller pci1_hose; #endif /* CONFIG_PCI */ #ifdef CONFIG_PCI2 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 542877b..81a4eb7 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -331,12 +331,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS 1 -#if !defined(CONFIG_PCI_PNP) - #define PCI_ENET0_IOADDR 0xe0000000 - #define PCI_ENET0_MEMADDR 0xe0000000 - #define PCI_IDSEL_NUMBER 0x0c /* slot0->3(IDSEL)=12->15 */ -#endif - /*PCIE video card used*/ #define VIDEO_IO_OFFSET CONFIG_SYS_PCI2_IO_PHYS |