summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-09-10 00:17:42 +0200
committerWolfgang Denk <wd@denx.de>2011-09-10 00:17:42 +0200
commitd786882db223db2a48071a86af0777002f77c764 (patch)
tree85d6bf7681147b61fe622bd979b99b43083a9d04 /board
parent297f18ac0fbeef30ba1c17fe131ca75f09a6e7cf (diff)
parentd5c784ed537fa774deefa76ebe3b726728d144e1 (diff)
downloadu-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')
-rw-r--r--board/freescale/mpc8548cds/mpc8548cds.c6
-rw-r--r--board/freescale/mpc8568mds/mpc8568mds.c11
-rw-r--r--board/freescale/mpc8610hpcd/mpc8610hpcd.c11
3 files changed, 13 insertions, 15 deletions
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c
index f5c799b..5ffae47 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/freescale/mpc8548cds/mpc8548cds.c
@@ -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>
*
@@ -207,8 +207,7 @@ static struct pci_config_table pci_mpc85xxcds_config_table[] = {
{},
};
-static struct pci_controller pci1_hose = {
- config_table: pci_mpc85xxcds_config_table};
+static struct pci_controller pci1_hose;
#endif /* CONFIG_PCI */
#ifdef CONFIG_PCI2
@@ -253,6 +252,7 @@ void pci_init_board(void)
pci_arb ? "arbiter" : "external-arbiter",
pci_info.regs);
+ pci1_hose.config_table = pci_mpc85xxcds_config_table;
first_free_busno = fsl_pci_init_port(&pci_info,
&pci1_hose, first_free_busno);
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 {
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 8aceddb..1854e27 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -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
* project.
@@ -227,11 +227,7 @@ static struct pci_config_table pci_fsl86xxads_config_table[] = {
#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 */
void pci_init_board(void)
@@ -261,6 +257,9 @@ void pci_init_board(void)
" (base address %lx)\n",
pci_agent ? "Agent" : "Host",
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,
&pci1_hose, first_free_busno);
} else {