diff options
author | Wolfgang Denk <wd@denx.de> | 2011-09-10 00:17:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-09-10 00:17:42 +0200 |
commit | d786882db223db2a48071a86af0777002f77c764 (patch) | |
tree | 85d6bf7681147b61fe622bd979b99b43083a9d04 /board/freescale/mpc8568mds/mpc8568mds.c | |
parent | 297f18ac0fbeef30ba1c17fe131ca75f09a6e7cf (diff) | |
parent | d5c784ed537fa774deefa76ebe3b726728d144e1 (diff) | |
download | u-boot-imx-d786882db223db2a48071a86af0777002f77c764.zip u-boot-imx-d786882db223db2a48071a86af0777002f77c764.tar.gz u-boot-imx-d786882db223db2a48071a86af0777002f77c764.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx:
powerpc/mpc8610hpcd: set pci1_hose.config_table after fsl_setup_hose
powerpc/mpc8548cds: set pci1_hose.config_table after fsl_setup_hose
powerpc/mpc8568mds: set pci1_hose.config_table after fsl_setup_hose
Diffstat (limited to 'board/freescale/mpc8568mds/mpc8568mds.c')
-rw-r--r-- | board/freescale/mpc8568mds/mpc8568mds.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 5cda81c..225c5d8 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -1,5 +1,5 @@ /* - * Copyright 2007,2009-2010 Freescale Semiconductor, Inc. + * Copyright 2007,2009-2011 Freescale Semiconductor, Inc. * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * @@ -259,11 +259,7 @@ static struct pci_config_table pci_mpc8568mds_config_table[] = { }; #endif -static struct pci_controller pci1_hose = { -#ifndef CONFIG_PCI_PNP - config_table: pci_mpc8568mds_config_table, -#endif -}; +static struct pci_controller pci1_hose; #endif /* CONFIG_PCI */ /* @@ -347,6 +343,9 @@ void pci_init_board(void) pci_arb ? "arbiter" : "external-arbiter", pci_info.regs); +#ifndef CONFIG_PCI_PNP + pci1_hose.config_table = pci_mpc8568mds_config_table; +#endif first_free_busno = fsl_pci_init_port(&pci_info, &pci1_hose, first_free_busno); } else { |