brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-09 19:53:53 +09:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

Browse Source 
* '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
This commit is contained in:
Wolfgang Denk 2011-09-10 00:17:42 +02:00
commit d786882db2
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/freescale/mpc8548cds/mpc8548cds.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2004, 2007, 2009-2010 Freescale Semiconductor, Inc. * Copyright 2004, 2007, 2009-2011 Freescale Semiconductor, Inc.
* *
* (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
* *
@ -207,8 +207,7 @@ static struct pci_config_table pci_mpc85xxcds_config_table[] = {
{}, {},
}; };
static struct pci_controller pci1_hose = { static struct pci_controller pci1_hose;
config_table: pci_mpc85xxcds_config_table};
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifdef CONFIG_PCI2 #ifdef CONFIG_PCI2
@ -253,6 +252,7 @@ void pci_init_board(void)
pci_arb ? "arbiter" : "external-arbiter", pci_arb ? "arbiter" : "external-arbiter",
pci_info.regs); pci_info.regs);
pci1_hose.config_table = pci_mpc85xxcds_config_table;
first_free_busno = fsl_pci_init_port(&pci_info, first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno); &pci1_hose, first_free_busno);

11
board/freescale/mpc8568mds/mpc8568mds.c
View File

@ -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> * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
* *
@ -259,11 +259,7 @@ static struct pci_config_table pci_mpc8568mds_config_table[] = {
}; };
#endif #endif
static struct pci_controller pci1_hose = { static struct pci_controller pci1_hose;
#ifndef CONFIG_PCI_PNP
config_table: pci_mpc8568mds_config_table,
#endif
};
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
/* /*
@ -347,6 +343,9 @@ void pci_init_board(void)
pci_arb ? "arbiter" : "external-arbiter", pci_arb ? "arbiter" : "external-arbiter",
pci_info.regs); 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, first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno); &pci1_hose, first_free_busno);
} else { } else {

11
board/freescale/mpc8610hpcd/mpc8610hpcd.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2007,2009-2010 Freescale Semiconductor, Inc. * Copyright 2007,2009-2011 Freescale Semiconductor, Inc.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -227,11 +227,7 @@ static struct pci_config_table pci_fsl86xxads_config_table[] = {
#endif #endif
static struct pci_controller pci1_hose = { static struct pci_controller pci1_hose;
#ifndef CONFIG_PCI_PNP
config_table:pci_mpc86xxcts_config_table
#endif
};
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
void pci_init_board(void) void pci_init_board(void)
@ -261,6 +257,9 @@ void pci_init_board(void)
" (base address %lx)\n", " (base address %lx)\n",
pci_agent ? "Agent" : "Host", pci_agent ? "Agent" : "Host",
pci_info.regs); pci_info.regs);
#ifndef CONFIG_PCI_PNP
pci1_hose.config_table = pci_mpc86xxcts_config_table;
#endif
first_free_busno = fsl_pci_init_port(&pci_info, first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno); &pci1_hose, first_free_busno);
} else { } else {