From 38ad82da0c1180ecdeb212a8f4245e945bcc546e Mon Sep 17 00:00:00 2001
From: Grzegorz Bernacki <gjb@semihalf.com>
Date: Tue, 11 Sep 2007 15:42:11 +0200
Subject: [PATCH] [GP3SSA] Add define CONFIG_MPC85XX_PCI2 in config file to
allow u-boot to scan on second pci bus.
Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
---
board/stxssa/stxssa.c | 9 ++++++---
include/configs/stxssa.h | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 5882124150..9a2bfbef8e 100644
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -378,9 +378,12 @@ static struct pci_config_table pci_stxgp3_config_table[] = {
#endif
-static struct pci_controller hose = {
+static struct pci_controller hose[] = {
#ifndef CONFIG_PCI_PNP
- config_table: pci_stxgp3_config_table,
+ { config_table: pci_stxgp3_config_table,},
+#ifdef CONFIG_MPC85XX_PCI2
+ {},
+#endif
#endif
};
@@ -393,6 +396,6 @@ pci_init_board(void)
#ifdef CONFIG_PCI
extern void pci_mpc85xx_init(struct pci_controller *hose);
- pci_mpc85xx_init(&hose);
+ pci_mpc85xx_init(hose);
#endif /* CONFIG_PCI */
}
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index f32ff67d9f..b41dafaf98 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -230,7 +230,7 @@
#define CFG_PCI2_IO_SIZE 0x01000000 /* 16M */
#if defined(CONFIG_PCI) /* PCI Ethernet card */
-
+#define CONFIG_MPC85XX_PCI2 1
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
--
GitLab