From: Stefan Roese <sr@denx.de>
Date: Mon, 5 Nov 2007 06:43:05 +0000 (+0100)
Subject: ppc4xx: Make output a little shorter on PCIe detection
X-Git-Tag: v1.3.2-rc1~102^2~83
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=654f38b3a387886996a5a75771fbfc29cb4f225e;p=u-boot

ppc4xx: Make output a little shorter on PCIe detection

Now not max 3 lines but 2 lines are printed per PCIe port.

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/amcc/katmai/katmai.c b/board/amcc/katmai/katmai.c
index 0627a7a095..669b828a12 100644
--- a/board/amcc/katmai/katmai.c
+++ b/board/amcc/katmai/katmai.c
@@ -403,15 +403,13 @@ void pcie_setup_hoses(int busno)
 		if (!katmai_pcie_card_present(i))
 			continue;
 
-		if (is_end_point(i)) {
-			printf("PCIE%d: will be configured as endpoint\n", i);
+		if (is_end_point(i))
 			ret = ppc4xx_init_pcie_endport(i);
-		} else {
-			printf("PCIE%d: will be configured as root-complex\n", i);
+		else
 			ret = ppc4xx_init_pcie_rootport(i);
-		}
 		if (ret) {
-			printf("PCIE%d: initialization failed\n", i);
+			printf("PCIE%d: initialization as %s failed\n", i,
+			       is_end_point(i) ? "endpoint" : "root-complex");
 			continue;
 		}
 
diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c
index 77c0eb4364..0939b54931 100644
--- a/board/amcc/kilauea/kilauea.c
+++ b/board/amcc/kilauea/kilauea.c
@@ -342,15 +342,13 @@ void pcie_setup_hoses(int busno)
 
 	for (i = 0; i < board_pcie_count(); i++) {
 
-		if (is_end_point(i)) {
-			printf("PCIE%d: will be configured as endpoint\n", i);
+		if (is_end_point(i))
 			ret = ppc4xx_init_pcie_endport(i);
-		} else {
-			printf("PCIE%d: will be configured as root-complex\n", i);
+		else
 			ret = ppc4xx_init_pcie_rootport(i);
-		}
 		if (ret) {
-			printf("PCIE%d: initialization failed\n", i);
+			printf("PCIE%d: initialization as %s failed\n", i,
+			       is_end_point(i) ? "endpoint" : "root-complex");
 			continue;
 		}
 
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index bb3e59400f..17aaa26909 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -853,18 +853,17 @@ void pcie_setup_hoses(int busno)
 			continue;
 
 		if (is_end_point(i)) {
-			printf("PCIE%d: will be configured as endpoint\n",i);
 			yucca_setup_pcie_fpga_endpoint(i);
 			ret = ppc4xx_init_pcie_endport(i);
 		} else {
-			printf("PCIE%d: will be configured as root-complex\n",i);
 			yucca_setup_pcie_fpga_rootpoint(i);
 			ret = ppc4xx_init_pcie_rootport(i);
 		}
 		if (ret) {
- 			printf("PCIE%d: initialization failed\n", i);
- 			continue;
- 		}
+			printf("PCIE%d: initialization as %s failed\n", i,
+			       is_end_point(i) ? "endpoint" : "root-complex");
+			continue;
+		}
 
 		hose = &pcie_hose[i];
 		hose->first_busno = bus;